Changeset 4556 in orxonox.OLD for orxonox/trunk/src/orxonox.cc

Timestamp:

Jun 8, 2005, 2:35:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: style

File:

• orxonox/trunk/src/orxonox.cc (modified) (20 diffs)

orxonox/trunk/src/orxonox.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -16 +16 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -68 +68 @@
    \brief remove Orxonox from memory
 */
-Orxonox::~Orxonox () 
+Orxonox::~Orxonox ()
 {
   int i =0;
@@ -96 +96 @@
 /**
    \brief this finds the config file
-   
+
    Since the config file varies from user to user and since one may want to specify different config files
    for certain occasions or platforms this function finds the right config file for every occasion and stores
@@ -115 +115 @@
   // parse command line
   // config file
-  
+
   getConfigFile (argc, argv);
   SDL_Init (SDL_INIT_TIMER);
@@ -130 +130 @@
   //printf("> Initializing world\n");
   //if( init_world () == -1) return -1; PB: world will be initialized when started
-  
+
   return 0;
 }
@@ -137 +137 @@
    \brief initializes SDL and OpenGL
 */
-int Orxonox::initVideo() 
+int Orxonox::initVideo()
 {
   PRINTF(3)("> Initializing video\n");
-  
+
   GraphicsEngine::getInstance();
-    
+
   return 0;
 }
@@ -150 +150 @@
    \brief initializes the sound engine
 */
-int Orxonox::initSound() 
+int Orxonox::initSound()
 {
   PRINT(3)("> Initializing sound\n");
@@ -162 +162 @@
    \brief initializes input functions
 */
-int Orxonox::initInput() 
+int Orxonox::initInput()
 {
   this->eventHandler = EventHandler::getInstance();
   this->eventHandler->init();
-  
+
   return 0;
 }
@@ -174 +174 @@
    \brief initializes network system
 */
-int Orxonox::initNetworking() 
+int Orxonox::initNetworking()
 {
   printf("Not yet implemented\n");
@@ -184 +184 @@
    \brief initializes and loads resource files
 */
-int Orxonox::initResources() 
+int Orxonox::initResources()
 {
   PRINT(3)("initializing ResourceManager\n");
@@ -200 +200 @@
   memset (namebuf, 0, 256);
   memset (valuebuf, 0, 256);
-  
+
   while( parser.nextVar (namebuf, valuebuf) != -1)
     {
       if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
-        {
-          //  printf("Not yet implemented\n");
-          if (!resourceManager->setDataDir(valuebuf))
-            {
-              PRINTF(1)("Data Could not be located\n");
-              exit(-1);
-            }
-        }
-      
+        {
+          //  printf("Not yet implemented\n");
+          if (!resourceManager->setDataDir(valuebuf))
+            {
+              PRINTF(1)("Data Could not be located\n");
+              exit(-1);
+            }
+        }
+
       memset (namebuf, 0, 256);
       memset (valuebuf, 0, 256);
     }
-  
+
   if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
     {
       PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
-                resourceManager->getDataDir(),
-                DEFAULT_CONFIG_FILE,
-                CONFIG_SECTION_DATA,
-                CONFIG_NAME_DATADIR);
+                resourceManager->getDataDir(),
+                DEFAULT_CONFIG_FILE,
+                CONFIG_SECTION_DATA,
+                CONFIG_NAME_DATADIR);
       exit(-1);
     }
@@ -250 +250 @@
 void Orxonox::start()
 {
-  
+
   this->gameLoader = GameLoader::getInstance();
   this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
@@ -261 +261 @@
 /**
    \brief handles sprecial events from localinput
-   \param event: an event not handled by the CommandNode 
+   \param event: an event not handled by the CommandNode
 */
 void Orxonox::graphicsHandler(SDL_Event* event)
@@ -274 +274 @@
     }
 }
- 
+
 
 /**
@@ -292 +292 @@
    here the journey begins
 */
-int main(int argc, char** argv) 
-{ 
+int main(int argc, char** argv)
+{
 
   // here the pre-arguments are loaded, these are needed to go either to orxonx itself, Help, or Benchmark.
@@ -333 +333 @@
     {
       if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
-        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-      
+        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
+
       // starting the GUI
       Gui* gui = new Gui(argc, argv);
@@ -340 +340 @@
 
       if (! gui->startOrxonox)
-        return 0;
-      
+        return 0;
+
       delete gui;
     }
-  
+
   PRINT(0)(">>> Starting Orxonox <<<\n");
 
@@ -350 +350 @@
 
   Orxonox *orx = Orxonox::getInstance();
-  
+
   if((*orx).init(argc, argv) == -1)
     {
@@ -356 +356 @@
       return -1;
     }
-  
+
   orx->start();
-  
+
   delete orx;
   ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-  
-}
+
+}