[Orxonox-commit 467] r3042 - branches/pickups2/src/orxonox/objects/pickup

bknecht at orxonox.net bknecht at orxonox.net
Sun May 24 22:23:44 CEST 2009


Author: bknecht
Date: 2009-05-24 22:23:43 +0200 (Sun, 24 May 2009)
New Revision: 3042

Modified:
   branches/pickups2/src/orxonox/objects/pickup/Jump.h
   branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h
   branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h
Log:
fixed some includes to make code compilable on Unix systems

Modified: branches/pickups2/src/orxonox/objects/pickup/Jump.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/Jump.h	2009-05-24 20:01:49 UTC (rev 3041)
+++ branches/pickups2/src/orxonox/objects/pickup/Jump.h	2009-05-24 20:23:43 UTC (rev 3042)
@@ -34,6 +34,8 @@
 #ifndef _Jump_H__
 #define _Jump_H__
 
+#include <climits>
+
 #include "OrxonoxPrereqs.h"
 
 #include "UsableItem.h"

Modified: branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h	2009-05-24 20:01:49 UTC (rev 3041)
+++ branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h	2009-05-24 20:23:43 UTC (rev 3042)
@@ -34,11 +34,13 @@
 #ifndef _ModifierPickup_H__
 #define _ModifierPickup_H__
 
+#include <climits>
+
 #include "OrxonoxPrereqs.h"
 
 #include "PassiveItem.h"
 #include "ModifierType.h"
-#include "orxonox/tools/timer.h"
+#include "orxonox/tools/Timer.h"
 
 namespace orxonox
 {

Modified: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h	2009-05-24 20:01:49 UTC (rev 3041)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h	2009-05-24 20:23:43 UTC (rev 3042)
@@ -39,7 +39,7 @@
 #include "core/BaseObject.h"
 #include "objects/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
-#include "tools/timer.h"
+#include "tools/Timer.h"
 
 namespace orxonox
 {




More information about the Orxonox-commit mailing list