Changeset 7677 in orxonox.OLD for trunk

Timestamp:

May 18, 2006, 12:42:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: POD's

Location:

trunk/src

Files:

• lib/event/key_mapper.cc (modified) (2 diffs)
• lib/graphics/importer/objModel.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/story_entity.cc (modified) (1 diff)

trunk/src/lib/event/key_mapper.cc

@@ -148 +148 @@
   while( iniParser->getCurrentName() != "" )
   {
-    PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName().c_str(), iniParser->getCurrentValue().c_str());
     // map the name to an sdl index
     index = nameToIndex (iniParser->getCurrentValue());
@@ -229 +229 @@
         {
           *map[i].pValue = index[1];
-          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(index[1]), index[1]);
+          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name.c_str(), SDLKToKeyname(index[1]).c_str(), index[1]);
           break;
         }
         else {
           *map[i].pValue = index[1];
-          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLBToButtonname(index[1]), index[1]);
+          PRINTF(4)("Mapping %s to '%s' (id %i)\n", name.c_str(), SDLBToButtonname(index[1]).c_str(), index[1]);
           break;
         }

trunk/src/lib/graphics/importer/objModel.cc

@@ -75 +75 @@
       this->objPath.erase(len, this->objPath.size());
       this->objPath[len] = '\0';
-      PRINTF(4)("Resolved file %s to Path %s.\n", fileName.c_str()), this->objPath.c_str());
+      PRINTF(4)("Resolved file %s to Path %s.\n", fileName, this->objPath.c_str());
     }
   else

trunk/src/orxonox.cc

@@ -198 +198 @@
     this->configFileName = File(DEFAULT_CONFIG_FILE).name();
 
-  PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
+  PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName.c_str());
 }
 

trunk/src/story_entities/game_world.cc

@@ -145 +145 @@
   PRINTF(0)("Loading the GameWorld\n");
 
-  PRINTF(3)("> Loading world: '%s'\n", getLoadFile());
+  PRINTF(3)("> Loading world: '%s'\n", getLoadFile().c_str());
   TiXmlElement* element;
   GameLoader* loader = GameLoader::getInstance();

trunk/src/story_entities/story_entity.cc

@@ -139 +139 @@
 void StoryEntity::grabWorldInfo()
 {
-  PRINTF(3)("Grabbing the Worlds Settings\n", this->getLoadFile());
+  PRINTF(3)("Grabbing the Worlds Settings\n", this->getLoadFile().c_str());
   if( getLoadFile().empty())
         return;