Changeset 4113 in orxonox.OLD for orxonox/trunk/src

Timestamp:

May 7, 2005, 7:42:48 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: better output

Location:

orxonox/trunk/src

Files:

• game_loader.cc (modified) (4 diffs)
• game_loader.h (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

orxonox/trunk/src/game_loader.cc

@@ -173 +173 @@
    this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
 */
-Campaign* GameLoader::fileToCampaign(char *name)
+Campaign* GameLoader::fileToCampaign(const char *name)
 {
   /* do not entirely load the campaign. just the current world
@@ -182 +182 @@
   if( name == NULL)
     {
-      PRINTF0("No filename specified for loading");
+      PRINTF(2)("No filename specified for loading");
       return NULL;
     }
@@ -191 +191 @@
     {
       // report an error
-      PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+      PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", name, XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
       delete XMLDoc;
       return NULL;
@@ -203 +203 @@
     {
       // report an error
-      PRINTF(0)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+      PRINTF(2)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
       delete XMLDoc;
       return NULL;

orxonox/trunk/src/game_loader.h

@@ -64 +64 @@
   Campaign* currentCampaign; //!> the current campaign playing
   
-  Campaign* fileToCampaign(char* name);
+  Campaign* fileToCampaign(const char* name);
 
   Factory* first;

orxonox/trunk/src/orxonox.cc

@@ -108 +108 @@
   SDL_Init (SDL_INIT_TIMER);
   // initialize everything
+  printf("> Initializing resources\n");
+  if( initResources () == -1) return -1;
+
   if( initVideo() == -1) return -1;
   if( initSound() == -1) return -1;
@@ -114 +117 @@
   printf("> Initializing networking\n");
   if( initNetworking () == -1) return -1;
-  printf("> Initializing resources\n");
-  if( initResources () == -1) return -1;
   //printf("> Initializing world\n");
   //if( init_world () == -1) return -1; PB: world will be initialized when started