Changeset 5558 in orxonox.OLD for branches/world_entities/src/world_entities/player.cc

Timestamp:

Nov 13, 2005, 3:10:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

File:

• branches/world_entities/src/world_entities/player.cc (modified) (2 diffs)

branches/world_entities/src/world_entities/player.cc

@@ -23 +23 @@
 #include "factory.h"
 
-#include "weapon_manager.h"
-#include "test_gun.h"
-#include "turret.h"
+#include "weapons/weapon_manager.h"
+#include "weapons/test_gun.h"
+#include "weapons/turret.h"
 
 #include "list.h"
@@ -337 +337 @@
 }
 
-#include "aiming_turret.h"
+#include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
 void Player::ADDWEAPON()