Changeset 5208 in orxonox.OLD

Timestamp:

Sep 19, 2005, 8:36:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: first fruits of valgrind…. delete[] are fine now

Location:

trunk/src

Files:

• lib/graphics/text_engine.cc (modified) (1 diff)
• lib/shell/shell.cc (modified) (6 diffs)
• lib/shell/shell.h (modified) (2 diffs)
• lib/shell/shell_input.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• util/loading/game_loader.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (10 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)

trunk/src/lib/graphics/text_engine.cc

@@ -104 +104 @@
 
   tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
-  if (!tmpFont)
+  if (tmpFont == NULL)
   {
     PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);

trunk/src/lib/shell/shell.cc

@@ -41 +41 @@
     ->describe("Deactivates the Shell. (moves it into background)")
     ->setAlias("hide");
+SHELL_COMMAND(textsize, Shell, setTextSize)
+    ->describe("Sets the size of the Text (size, linespacing)");
 
 /**
@@ -57 +59 @@
   this->setAbsCoor2D(3, -400);
   this->textSize = 15;
-  this->lineSpacing = 5;
+  this->lineSpacing = 0;
   this->bActive = false;
 
@@ -72 +74 @@
   // EVENT-Handler subscription of '`' to all States.
   EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
-
 }
 
@@ -139 +140 @@
   this->textSize = textSize;
   this->lineSpacing = lineSpacing;
-
-  this->rebuildText();
+  this->shellInput->setFont("fonts/dpquake_.ttf", this->textSize);
+
+//  this->rebuildText();
 }
 
@@ -150 +152 @@
 void Shell::rebuildText()
 {
-  this->shellInput->setFont("fonts/Aniron_Bold.ttf", this->textSize);
+  this->shellInput->setFont("fonts/dpquake_.ttf", this->textSize);
   this->shellInput->setColor(1, 0, 0);
   this->shellInput->setAlignment(TEXT_ALIGN_LEFT);
-  this->shellInput->setText(NULL);
   this->shellInput->setParent2D(this);
   this->shellInput->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
@@ -176 +177 @@
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
   {
-    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_RENDER_DYNAMIC);
+    this->bufferText[i] = TextEngine::getInstance()->createText("fonts/dpquake_.ttf", this->textSize, TEXT_RENDER_DYNAMIC);
     this->bufferText[i]->setColor(1, 0, 0);
     this->bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);

trunk/src/lib/shell/shell.h

@@ -4 +4 @@
  *
  * @todo check for smooth deletion process
+ * @todo Buffer Display in different Colors for different debug mode.
  */
 
@@ -78 +79 @@
     unsigned int             lineSpacing;            //!< The Spacing between lines.
     unsigned int             textSize;               //!< The size of the text.
+    char*                    textFont;               //!< The file containing the font.
 
     // HANDLING TEXT INPUT

trunk/src/lib/shell/shell_input.h

@@ -2 +2 @@
  * @file shell_input.h
  * @brief Definition of ...
+ * @todo AutoCompletion should print nice output
+ * @todo move up and down in Buffer
+ * @todo display old shell Commands
 */
 

trunk/src/orxonox.cc

@@ -196 +196 @@
   char* icon = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
   GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, icon);
-  delete icon;
+  delete[] icon;
   return 0;
 }

trunk/src/util/loading/game_loader.cc

@@ -107 +107 @@
     {
       this->currentCampaign = this->fileToCampaign(campaignName);
-      delete campaignName;
+      delete[] campaignName;
     }
 //   World* world0 = new World(DEBUG_WORLD_0);

trunk/src/util/resource_manager.cc

@@ -96 +96 @@
   if (isDir(realDir))
     {
-      delete this->dataDir;
+      delete[] this->dataDir;
       this->dataDir = new char[strlen(realDir)+1];
       strcpy(this->dataDir, realDir);
@@ -126 +126 @@
   sprintf(testFile, "%s%s", this->dataDir, fileInside);
   retVal = isFile(testFile);
-  delete testFile;
+  delete[] testFile;
   return retVal;
 }
@@ -382 +382 @@
     {
       PRINTF(2)("Resource %s could not be loaded\n", fileName);
+      delete[] tmpResource->name;
       delete tmpResource;
       return NULL;
@@ -456 +457 @@
           // deleting the List Entry:
           PRINTF(4)("Resource %s safely removed.\n", resource->name);
-          delete []resource->name;
+          delete[] resource->name;
           this->resourceList->remove(resource);
         }
@@ -625 +626 @@
       else
         {
-          delete tmpDirName;
+          delete[] tmpDirName;
           return false;
         }
@@ -653 +654 @@
                             ))
         {
-          delete tmpFileName;
+          delete[] tmpFileName;
           return true;
         }
       else
         {
-          delete tmpFileName;
+          delete[] tmpFileName;
           return false;
         }
@@ -664 +665 @@
   else
     {
-      delete tmpFileName;
+      delete[] tmpFileName;
       return false;
     }
@@ -682 +683 @@
     {
       PRINTF(1)("could not open %s fro writing\n", fileName);
+      delete[] tmpName;
       return false;
     }
   fclose(stream);
 
-  delete tmpName;
+  delete[] tmpName;
 }
 
@@ -699 +701 @@
   char* tmpName = ResourceManager::homeDirCheck(fileName);
   unlink(tmpName);
-  delete tmpName;
+  delete[] tmpName;
 }
 
@@ -748 +750 @@
   else
     {
-      delete retName;
+      delete[] retName;
       return NULL;
     }

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -90 +90 @@
     }
     this->currentSlotConfig[i].position.setName(tmpName);
-    delete tmpName;
+    delete[] tmpName;
   }
 

trunk/src/world_entities/world_entity.cc

@@ -19 +19 @@
 
 #include "world_entity.h"
+#include "shell_command.h"
 
 #include "resource_manager.h"
@@ -27 +28 @@
 
 using namespace std;
+
+SHELL_COMMAND(model, WorldEntity, loadModel)
+    ->describe("sets the Model of the WorldEntity")
+    ->defaultValues(1, "models/ships/reaplow.obj");
+
 
 /**