Changeset 9371 in orxonox.OLD for branches/proxy/src/util

Timestamp:

Jul 20, 2006, 11:08:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ORXONOX is now completely std::stringed

Location:

branches/proxy/src/util

Files:

• fast_factory.cc (modified) (4 diffs)
• multiplayer_team_deathmatch.cc (modified) (1 diff)
• object_manager.cc (modified) (1 diff)

branches/proxy/src/util/fast_factory.cc

@@ -79 +79 @@
 void FastFactory::registerFastFactory(FastFactory* fastFactory)
 {
-  PRINTF(4)("Registered FastFactory for '%s'\n", fastFactory->getName());
+  PRINTF(4)("Registered FastFactory for '%s'\n", fastFactory->getCName());
 
   if( FastFactory::first == NULL)
@@ -128 +128 @@
     while (tmpFac != NULL)
     {
-      if (fastFactoryName == tmpFac->getName())
+      if (fastFactoryName == tmpFac->getCName())
         return tmpFac;
       tmpFac = tmpFac->next;
@@ -145 +145 @@
   while (tmpFac != NULL)
   {
-    PRINTF(4)("DELETEING ALL OF %s\n",tmpFac->getName());
+    PRINTF(4)("DELETEING ALL OF %s\n",tmpFac->getCName());
     tmpFac->flush(hardFLUSH);
     tmpFac = tmpFac->next;
@@ -202 +202 @@
 BaseObject* FastFactory::resurrect()
 {
-  PRINTF(4)("Resurecting Object of type %s\n", this->getName());
+  PRINTF(4)("Resurecting Object of type %s\n", this->getCName());
   if (unlikely(this->deadList == NULL))
   {
     PRINTF(3)("The deadList of Class %s is empty, this may be either because it has not been filled yet, or the cache is to small.\n" \
         "  Developer: try increasing the count with FastFactory::prepare(contHigher than actual)\n" \
-        "    Fabricating a new %s\n", this->getName(), this->getName());
+        "    Fabricating a new %s\n", this->getCName(), this->getCName());
     this->fabricate();
     return this->resurrect();

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -723 +723 @@
   int victimUserId = victim->getOwner();
 
-  PRINTF(0)("%d %d %x %x %s %s\n", killerUserId, victimUserId, killer, victim, killer->getClassName(), victim->getClassName());
+  PRINTF(0)("%d %d %x %x %s %s\n", killerUserId, victimUserId, killer, victim, killer->getClassCName(), victim->getClassCName());
 
   PlayerStats & victimStats = *PlayerStats::getStats( victimUserId );

branches/proxy/src/util/object_manager.cc

@@ -140 +140 @@
       for (entity = this->objectLists[omList].begin(); entity != this->objectLists[omList].end(); entity++)
       {
-        PRINT(0)(" | %s::%s\n",(*entity)->getClassName(), (*entity)->getName());
+        PRINT(0)(" | %s::%s\n",(*entity)->getClassCName(), (*entity)->getCName());
       }
     }