Context Navigation

pickup

Timestamp:

Sep 1, 2009, 12:38:36 AM (15 years ago)

Author:

landauf

Message:

Removed /objects/ from all paths (except from those in the objects module of course).
Compiles again.

Location:

code/branches/libraries2/src/orxonox/pickup

Files:

r3196	r5735
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~worldentities/pawns/Pawn.h"
	38	#include "worldentities/pawns/Pawn.h"
39	39
40	40	namespace orxonox

-                      r3196
+                      r5735
 #include "core/Executor.h"
 #include "BaseItem.h"
 #include "objects/worldentities/Billboard.h"
 #include "objects/worldentities/Model.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/Billboard.h"
+#include "worldentities/Model.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

r5693	r5735
39	39	#include "tools/Timer.h"
40	40	#include "tools/interfaces/Tickable.h"
41		#include "~~objects/~~worldentities/StaticEntity.h"
	41	#include "worldentities/StaticEntity.h"
42	42
43	43	namespace orxonox

r3280	r5735
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~worldentities/pawns/Pawn.h"
	38	#include "worldentities/pawns/Pawn.h"
39	39
40	40	namespace orxonox

-                      r3370
+                      r5735
 #include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "controllers/HumanController.h"
+#include "worldentities/pawns/Pawn.h"
 #include "EquipmentItem.h"

r3370	r5735
40	40	#include "core/Template.h"
41	41	#include "core/XMLPort.h"
42		#include "~~objects/~~worldentities/pawns/Pawn.h"
	42	#include "worldentities/pawns/Pawn.h"
43	43	#include "PickupInventory.h" // HACK; Only for hack, remove later
44	44

r5693	r5735
40	40	#include "tools/Timer.h"
41	41	#include "tools/interfaces/Tickable.h"
42		#include "~~objects/~~worldentities/StaticEntity.h"
	42	#include "worldentities/StaticEntity.h"
43	43
44	44	namespace orxonox

r3196	r5735
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		#include "~~objects/~~worldentities/pawns/Pawn.h"
	38	#include "worldentities/pawns/Pawn.h"
39	39
40	40	namespace orxonox

r3196	r5735
36	36
37	37	#include "OrxonoxPrereqs.h"
38		#include "~~objects/~~pickup/PassiveItem.h"
	38	#include "pickup/PassiveItem.h"
39	39
40	40	namespace orxonox

-                      r3196
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/pickup/DroppedItem.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "pickup/DroppedItem.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

r3196	r5735
38	38
39	39	#include <climits>
40		#include "~~objects/~~pickup/UsableItem.h"
	40	#include "pickup/UsableItem.h"
41	41
42	42	namespace orxonox

-                      r3196
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/pickup/DroppedItem.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "pickup/DroppedItem.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

r3196	r5735
41	41	#include <climits>
42	42	#include "util/Math.h"
43		#include "~~objects/~~pickup/UsableItem.h"
	43	#include "pickup/UsableItem.h"
44	44
45	45	namespace orxonox

Note: See TracChangeset for help on using the changeset viewer.