Changeset 6386 in orxonox.OLD for branches/network/src/story_entities/game_world.cc

Timestamp:

Jan 2, 2006, 1:30:23 AM (20 years ago)

Author:

patrick

Message:

network: many changes in the StoryEntity and Campaign framework: introduced CampaignData as a container for the data of the Campaign and made some changes in the GameWorlds, which are not yet finished

File:

• branches/network/src/story_entities/game_world.cc (modified) (9 diffs)

branches/network/src/story_entities/game_world.cc

@@ -278 +278 @@
           BaseObject* created = Factory::fabricate(element);
           if( created != NULL )
-          {
-            if(created->isA(CL_WORLD_ENTITY))
-              this->spawn(dynamic_cast<WorldEntity*>(created));
             printf("Created a %s: %s\n", created->getClassName(), created->getName());
-          }
-
-          // if we load a 'Player' we use it as localPlayer
 
 
@@ -345 +339 @@
   //music->playback();
 
-  this->releaseLoadScreen();
-}
-
-
-/**
- *  initializes a new GameWorld shortly before start
- *
- * this is the function, that will be loaded shortly before the world is
- * started
-*/
-ErrorMessage GameWorld::preStart()
-{
-  this->bPause = false;
-
   /* update the object position before game start - so there are no wrong coordinates used in the first processing */
   PNode::getNullParent()->updateNode (0.001f);
   PNode::getNullParent()->updateNode (0.001f);
+
+  this->releaseLoadScreen();
 }
 
@@ -370 +352 @@
 ErrorMessage GameWorld::start()
 {
-  this->bQuitWorld = false;
+  this->isPaused = false;
+  this->isRunning = true;
   this->mainLoop();
 }
@@ -382 +365 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
-  this->bQuitWorld= true;
+  this->isRunning = false;
 }
 
@@ -408 +391 @@
 {
   PRINTF(3)("GameWorld::displayLoadScreen - start\n");
-
-  //GLMenuImageScreen*
   this->glmis = new GLMenuImageScreen();
   this->glmis->setMaximum(8);
-
   PRINTF(3)("GameWorld::displayLoadScreen - end\n");
 }
+
 
 /**
@@ -472 +453 @@
 {
   Uint32 currentFrame = SDL_GetTicks();
-  if(!this->bPause)
+  if( !this->isPaused)
     {
       this->dt = currentFrame - this->lastFrame;
@@ -624 +605 @@
   PRINTF(3)("GameWorld::mainLoop() - Entering main loop\n");
 
-  while(!this->bQuitWorld) /* @todo implement pause */
+  while( this->isRunning) /* @todo implement pause */
   {
     ++this->cycle;
@@ -631 +612 @@
       // Process input
     this->handleInput ();
-    if( this->bQuitWorld)
+    if( !this->isRunning)
       break;
       // Process time
@@ -652 +633 @@
  * @param entity to be added
 */
-void GameWorld::spawn(WorldEntity* entity)
-{
-//   this->entities->add (entity);
-  entity->postSpawn ();
-}
+// void GameWorld::spawn(WorldEntity* entity)
+// {
+// //   this->entities->add (entity);
+//   entity->postSpawn ();
+// }
 
 /**