Changeset 5219 in orxonox.OLD

Timestamp:

Sep 23, 2005, 1:37:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: warlord-fix

Location:

trunk/src

Files:

• lib/graphics/spatial_separation/quadtree.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (2 diffs)

trunk/src/lib/graphics/spatial_separation/quadtree.cc

@@ -87 +87 @@
     for (unsigned int i = 0; i < QUADTREE_MATERIAL_COUNT; i++)
       delete this->materials[i];
-    delete this->materials;
+    delete[] this->materials;
   }
 

trunk/src/orxonox.cc

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

trunk/src/util/resource_manager.cc

@@ -740 +740 @@
  * @param fileName the Name of the File to check
  * @returns The full name of the file, including the DataDir, and NULL if the file does not exist
- *  IMPORTANT: this has to be deleted from the outside
+ * !!IMPORTANT: this has to be deleted from the outside!!
 */
 char* ResourceManager::getFullName(const char* fileName)

trunk/src/world_entities/weapons/crosshair.cc

@@ -69 +69 @@
   this->setRotationSpeed(5);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
+
+  this->position2D[0] = 0;
+  this->position2D[1] = 0;
 
   this->material = new Material;
@@ -158 +161 @@
 
 
-  float z;
+  float z = 0.0f;
   glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
   //cout << z << endl;