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

Timestamp:

Sep 19, 2005, 12:31:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shell no more singleton, and ShellInput is now derive from Text correctly

Location:

trunk/src/story_entities

Files:

• world.cc (modified) (2 diffs)
• world.h (modified) (2 diffs)

trunk/src/story_entities/world.cc

@@ -119 +119 @@
 World::~World ()
 {
-  delete Shell::getInstance();
+  delete this->shell;
   PRINTF(3)("World::~World() - deleting current world\n");
 
@@ -200 +200 @@
 
   /* init the world interface */
-  Shell::getInstance();
+  this->shell = new Shell();
 
   LightManager::getInstance();

trunk/src/story_entities/world.h

@@ -24 +24 @@
 class PilotNode;
 
+class Shell;
 class OggPlayer;
 
@@ -93 +94 @@
   char* path;                         //!< The file from which this world is loaded
 
-
+  Shell*     shell;
   OggPlayer* music;