Changeset 5096 in orxonox.OLD for trunk

Timestamp:

Aug 22, 2005, 12:01:04 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: The Shell now is able to be initialized by orxonox.cc, not World anymore.
The error, i was looking for laid in Element2D, where some values did not point to NULL at the beginning… this was quite stupid indeed

Location:

trunk/src

Files:

• orxonox.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)
• util/shell.cc (modified) (4 diffs)
• util/shell.h (modified) (1 diff)

trunk/src/orxonox.cc

@@ -80 +80 @@
 Orxonox::~Orxonox ()
 {
+  delete Shell::getInstance();
   delete GraphicsEngine::getInstance(); // deleting the Graphics
   delete TextEngine::getInstance();
@@ -257 +258 @@
 int Orxonox::initMisc()
 {
+  Shell::getInstance();
   return 0;
 }

trunk/src/story_entities/world.cc

@@ -115 +115 @@
 World::~World ()
 {
-  delete Shell::getInstance();
   PRINTF(3)("World::~World() - deleting current world\n");
 
@@ -195 +194 @@
 
   /* init the world interface */
-  Shell::getInstance();
 
   LightManager::getInstance();

trunk/src/util/shell.cc

@@ -60 +60 @@
 
   EventHandler* evh = EventHandler::getInstance();
-  evh->subscribe(this, ES_GAME, SDLK_BACKQUOTE);
+  evh->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
   for (int i = 1; i < SDLK_F15; i++)
     evh->subscribe(this, ES_SHELL, i);
@@ -295 +295 @@
   this->inputLine = removeCharLine;
   this->inputLineText->setText(inputLine);
+}
+
+/**
+ * executes the command stored in the inputLine
+ * @return true if the command was commited successfully, false otherwise
+ */
+bool Shell::executeCommand()
+{
+
+  this->addBufferLineStatic("Execute Command: %s\n", this->inputLine);
+  delete this->inputLine;
+  this->inputLine = new char[1];
+  this->inputLine[0]='\0';
+  this->inputLineText->setText(this->inputLine);
+  return false;
 }
 
@@ -329 +344 @@
       this->removeCharacters(1);
     }
+    else if (event.type == SDLK_RETURN)
+      this->executeCommand();
     else if (event.type < 127)
     {
@@ -384 +401 @@
 void Shell::debug() const
 {
-
-}
+  if (this->pressedKey != SDLK_FIRST)
+    printf("%s::%f %f\n", SDLKToKeyname(this->pressedKey), this->delayed, this->repeatDelay);
+
+}

trunk/src/util/shell.h

@@ -52 +52 @@
     void addCharacters(const char* characters);
     void removeCharacters(unsigned int characterCount = 1);
+    bool executeCommand();