Changeset 3753 in orxonox.OLD

Timestamp:

Apr 7, 2005, 11:14:11 PM (19 years ago)

Author:

patrick

Message:

branches/levelloader: now compiling again under linux

Location:

orxonox/branches/levelloader/src

Files:

• lib/util/resource_manager.cc (modified) (4 diffs)
• orxonox.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)

orxonox/branches/levelloader/src/lib/util/resource_manager.cc

@@ -396 +396 @@
 bool ResourceManager::isDir(const char* directoryName)
 {
-        #ifdef __WIN32__
-                return false;
-        #elif
+#ifdef __WIN32__
+  return false;
+#elif __unix__
   struct stat status;
   stat(directoryName, &status);
@@ -405 +405 @@
   else
     return false;
-  #endif
+#endif
 }
 
@@ -417 +417 @@
 bool ResourceManager::isFile(const char* fileName)
 {
-        #ifdef __WIN32__
-                return false;
-        #elif
+#ifdef __WIN32__
+  return false;
+#elif __unix__
   struct stat status;
   stat(fileName, &status);
@@ -426 +426 @@
   else
     return false;
-  #endif
+#endif
 }
 

orxonox/branches/levelloader/src/orxonox.cc

@@ -344 +344 @@
 #include "base_object.h"
 
-#ifdef __WIN32__
-#elif
+#ifndef __WIN32__
 #include <asm/msr.h>
 #include <linux/timex.h>
@@ -358 +357 @@
 int startBenchmarks()
 {
-        #ifndef __WIN32__
+#ifndef __WIN32__
   printf("===========================================================\n");
   printf("=                      BENCHMARKS                         =\n");

orxonox/branches/levelloader/src/story_entities/world.cc

@@ +1 @@
+
 
 /* 
@@ -149 +150 @@
         }
         
-        localPlayer = NULL;
+  this->localPlayer = NULL;
   this->entities = new tList<WorldEntity>();
-                
+        
+
+  this->setClassName ("World");
 }