Changeset 709

Timestamp:

Dec 28, 2007, 10:43:22 PM (16 years ago)

Author:

rgrieder

Message:

• tardis box wanted to include "windows.h"… —> fixed

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (4 diffs)
• src/misc/Sleep.h (modified) (1 diff)

code/branches/FICN/bin/levels/sample.oxw

@@ -12 +12 @@
 
 
- <audio>
+ <!--audio>
                 <ambient>
                         <ogg src="allgorythm-lift_up" />
@@ -20 +20 @@
                         <ogg src="tha_silent_partner_-_void" />
                 </ambient>
-  </audio>
+  </audio--> 
 
   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
@@ -30 +30 @@
   <world>
     <Ambient colourvalue="1,1,1" />
-    <Skybox src="Orxonox/StarfieldSkyBox" />
+    <Skybox src="Orxonox/StarSkyBox" />
 
     <!--Fighter camera="true" position="0,0,0" scale="10" yaw="-90" pitch="-90" mesh="assf3.mesh"  forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" /-->
@@ -41 +41 @@
     <NPC position="100,0,400" scale="1" mesh="razor.mesh"/>
 
-    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
-    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />
+<!--    <Model position="200,0,500" scale="10" mesh="starship.mesh" yaw="-90" pitch="-90" />
+    <Model position="-200,0,500" scale="10" mesh="drone.mesh" yaw="-90" pitch="-90" />-->
 
     <Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yaw="-90" pitch="-90" />

code/branches/FICN/src/misc/Sleep.h

@@ -1 +1 @@
 // hack for the usleep/Sleep problem
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 #  include <windows.h>
 #  define usleep(x) Sleep((x)/1000)
-#elif ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX
+#else
 #  include <unistd.h>
 #endif