Changeset 8697 in orxonox.OLD for branches/terrain/src/orxonox.cc

Timestamp:

Jun 21, 2006, 11:45:20 PM (19 years ago)

Author:

patrick

Message:

merged the terrain with the new trunk (MARK TERRAIN)

Location:

branches/terrain

Files:

• . (copied) (copied from trunk)
• src/orxonox.cc (modified) (2 diffs)

branches/terrain/src/orxonox.cc

@@ -27 +27 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ORXONOX
 #include "orxonox.h"
-
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "orxonox"
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "00"
+#endif
 #include "globals.h"
 
@@ -511 +516 @@
   // checking for existence of the configuration-files, or if the lock file is still used
   if (showGui || (!File("./orxonox.conf").isFile() &&
-                  !File(DEFAULT_CONFIG_FILE).isFile())
-#if DEBUG_LEVEL <= 3 // developers do not need to see the GUI, when orxonox fails
-      || ResourceManager::isFile(DEFAULT_LOCK_FILE)
-#endif
-     )
+                  !File(DEFAULT_CONFIG_FILE).isFile() ) )
   {
     File lockFile(DEFAULT_LOCK_FILE);