[Orxonox-commit 939] r5662 - in code/branches/resource2: data src/core src/orxonox/tools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-19 12:27:59 +0200 (Wed, 19 Aug 2009)
New Revision: 5662

Modified:
   code/branches/resource2/data/CMakeLists.txt
   code/branches/resource2/src/core/Game.cc
   code/branches/resource2/src/core/GraphicsManager.cc
   code/branches/resource2/src/orxonox/tools/ResourceCollection.cc
Log:
Fixed build and a few issues and removed a warning.

Modified: code/branches/resource2/data/CMakeLists.txt
===================================================================
--- code/branches/resource2/data/CMakeLists.txt	2009-08-18 22:19:11 UTC (rev 5661)
+++ code/branches/resource2/data/CMakeLists.txt	2009-08-19 10:27:59 UTC (rev 5662)
@@ -39,7 +39,8 @@
 )
 
 IF(NOT EXTERNAL_DATA_DIRECTORY)
-  MESSAGE(STATUS "Warning: External data directory not found. If you want to compile while downloading the data files, you will have to recompile about four files afterwards and relink everything. \\n You can specify your own folder with the DATA_DIRECTORY variable. Default location for the path is orxonox_root/data_extern")
+  MESSAGE(STATUS "Warning: External data directory not found. If you want to compile while downloading the data files, you will have to recompile about four files afterwards and relink everything.")
+  MESSAGE(STATUS "You can specify your own folder with the EXTERNAL_DATA_DIRECTORY variable. Default location for the path is orxonox_root/data_extern")
   # Temporary override to the default location.
   SET(EXTERNAL_DATA_DIRECTORY ${CMAKE_SOURCE_DIR}/data_extern)
 ENDIF()

Modified: code/branches/resource2/src/core/Game.cc
===================================================================
--- code/branches/resource2/src/core/Game.cc	2009-08-18 22:19:11 UTC (rev 5661)
+++ code/branches/resource2/src/core/Game.cc	2009-08-19 10:27:59 UTC (rev 5662)
@@ -273,7 +273,7 @@
             try
             {
                 // Add tick time for most of the states
-                uint64_t timeBeforeTick;
+                uint64_t timeBeforeTick = 0;
                 if ((*it)->getInfo().bIgnoreTickTime)
                     timeBeforeTick = this->gameClock_->getRealMicroseconds();
                 (*it)->update(*this->gameClock_);

Modified: code/branches/resource2/src/core/GraphicsManager.cc
===================================================================
--- code/branches/resource2/src/core/GraphicsManager.cc	2009-08-18 22:19:11 UTC (rev 5661)
+++ code/branches/resource2/src/core/GraphicsManager.cc	2009-08-19 10:27:59 UTC (rev 5662)
@@ -85,9 +85,9 @@
         Non-initialising constructor.
     */
     GraphicsManager::GraphicsManager(bool bLoadRenderer)
-        : renderWindow_(0)
+        : ogreWindowEventListener_(new OgreWindowEventListener())
+        , renderWindow_(0)
         , viewport_(0)
-        , ogreWindowEventListener_(new OgreWindowEventListener())
     {
         RegisterObject(GraphicsManager);
 

Modified: code/branches/resource2/src/orxonox/tools/ResourceCollection.cc
===================================================================
--- code/branches/resource2/src/orxonox/tools/ResourceCollection.cc	2009-08-18 22:19:11 UTC (rev 5661)
+++ code/branches/resource2/src/orxonox/tools/ResourceCollection.cc	2009-08-19 10:27:59 UTC (rev 5662)
@@ -30,6 +30,7 @@
 
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
+#include "core/Resource.h"
 #include "core/XMLPort.h"
 #include "ResourceLocation.h"
 
@@ -43,7 +44,7 @@
         RegisterObject(ResourceCollection);
 
         // Default group is "General"
-        this->setResourceGroup(Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+        this->setResourceGroup(Resource::DEFAULT_GROUP);
     }
 
     ResourceCollection::~ResourceCollection()