Changeset 4827 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jul 9, 2005, 12:48:50 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: state is no more singleton, but static class.
This is faster, and easier to handle, because one can just say State::getBLA() and not State::getInstance()→getBLA(); ——→>> less redundant

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (4 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -135 +135 @@
   if( this->worldIsInitialized)
     return this->worldReference->getEntities();
-  PRINT(1)("Someone tried to use the WorldInterface before it has been initizlized! this can result in SEGFAULTs!\n");
+  PRINT(1)("tried to use the WorldInterface before it has been initizlized! this can result in SEGFAULTs!\n");
   return NULL;
 }
@@ -222 +222 @@
   //strcpy(this->worldName, name);
   this->debugWorldNr = worldID;
-  this->entities = new tList<WorldEntity>();
+  State::setWorldEntityList(this->entities = new tList<WorldEntity>());
   this->cycle = 0;
 
@@ -244 +244 @@
   if (!crosshair)
     crosshair = new Crosshair();
-
-  /*
-  // identifier
-  string = grabParameter( root, "identifier");
-  if( string == NULL || sscanf(string, "%d", &id) != 1)
-  {
-  PRINTF0("World is missing a proper 'identifier'\n");
-  this->setStoryID( -1);
-  }
-  else setStoryID( id);
-
-  // next id
-  string = grabParameter( root, "nextid");
-  if( string == NULL || sscanf(string, "%d", &id) != 1)
-  {
-  PRINTF0("World is missing a proper 'nextid'\n");
-  this->setStoryID( -1);
-  }
-  else setNextStoryID( id);
-
-
-  // path
-  string = grabParameter( root, "path");
-  if( string == NULL)
-  {
-  PRINTF0("World is missing a proper 'path'\n");
-  this->setPath( NULL);
-  }
-  else
-  {
-  name = new char[strlen(string + 2)];
-  strcpy( name, string);
-  this->setPath( name);
-  }
-  */
 }
 
@@ -304 +269 @@
   this->localCamera->setName ("Camera");
 
-  State::getInstance()->setCamera(this->localCamera, this->localCamera->getTarget());
+  State::setCamera(this->localCamera, this->localCamera->getTarget());
 
   GraphicsEngine::getInstance()->displayFPS(true);