Changeset 5212 in orxonox.OLD for trunk

Timestamp:

Sep 21, 2005, 8:07:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some little errors corrected via Valgrind

Location:

trunk/src

Files:

• lib/graphics/importer/texture.cc (modified) (1 diff)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• lib/shell/shell_buffer.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (1 diff)
• world_entities/player.h (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/texture.cc

@@ -32 +32 @@
 Texture::Texture(const char* imageName)
 {
-  bAlpha = false;
+  this->bAlpha = false;
   this->texture = 0;
   if (imageName)

trunk/src/lib/graphics/light.cc

@@ -242 +242 @@
 
   for (int i = 0; i < NUMBEROFLIGHTS; i++)
-    if (this->lights[i])
+    if (this->lights[i] != NULL)
       delete lights[i];
   delete[] lights;

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -467 +467 @@
 void Element2D::removeChild2D (Element2D* child)
 {
-  child->remove2D();
-  this->children->remove(child);
-  child->parent = NULL;
+  if (child != NULL)
+  {
+    child->remove2D();
+    this->children->remove(child);
+    child->parent = NULL;
+  }
 }
 

trunk/src/lib/shell/shell_buffer.cc

@@ -157 +157 @@
 
    // adding all the new Lines
-  while (newLineBegin < inputEnd)
+  while (newLineBegin < inputEnd )
   {
     newLineEnd = strchr(newLineBegin, '\n');
@@ -165 +165 @@
     {
 //       newLineEnd = newLineBegin + strlen(newLineBegin);
-      strcpy(this->keepBufferArray, newLineBegin);
+      strcat(this->keepBufferArray, newLineBegin);
       this->keepBuffer = true;
       break;

trunk/src/world_entities/player.cc

@@ -141 +141 @@
   PRINTF(1)("PLAYER INIT\n");
   travelSpeed = 15.0;
-  velocity = new Vector();
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;

trunk/src/world_entities/player.h

@@ -66 +66 @@
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
 
-    Vector*               velocity;           //!< the velocity of the player.
+    Vector                velocity;           //!< the velocity of the player.
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.

trunk/src/world_entities/skybox.cc

@@ -102 +102 @@
     delete this->material[i];
   delete []this->material;
+  delete this->model;
 }
 

trunk/src/world_entities/weapons/crosshair.cc

@@ -162 +162 @@
   //cout << z << endl;
 
-  GLdouble objX, objY, objZ;
+  GLdouble objX=.0, objY=.0, objZ=.0;
   gluUnProject(position2D[0],
                GraphicsEngine::getInstance()->getResolutionY()-position2D[1]-1,