Changeset 5313 in orxonox.OLD for trunk

Timestamp:

Oct 8, 2005, 2:07:42 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor nicessity fixes. no real bugs traced →

Location:

trunk/src

Files:

• util/track/track_manager.cc (modified) (6 diffs)
• util/track/track_manager.h (modified) (1 diff)
• world_entities/npc2.cc (modified) (1 diff)
• world_entities/skysphere.cc (modified) (1 diff)

trunk/src/util/track/track_manager.cc

@@ -105 +105 @@
       tIterator<TrackElement>* iterator = this->children->getIterator();
       TrackElement* enumElem = iterator->firstElement();
-      TrackElement* tmpElem;
+      TrackElement* tmpElem = NULL;
       while (enumElem)
         {
-          if ((tmpElem = enumElem->findByID(trackID)))
+          if ((tmpElem = enumElem->findByID(trackID)) != NULL)
             return tmpElem;
           enumElem = iterator->nextElement();
@@ -196 +196 @@
    Be aware, that when the trackElement has no Children, NULL will be returned
 */
-TrackElement* TrackElement::getChild(int childCount) const
+TrackElement* TrackElement::getChild(unsigned int childCount) const
 {
   // if the the trackElement has no children return NULL.
@@ -207 +207 @@
   tIterator<TrackElement>* iterator = this->children->getIterator();
   TrackElement* enumElem = iterator->firstElement();
-  for (int i = 0; i < childCount; i++)
+  for (unsigned int i = 0; i < childCount; i++)
     enumElem = iterator->nextElement();
   delete iterator;
@@ -881 +881 @@
   this->joinV(strings.getCount(), trackIDs);
 
-  for(int i = 0; i < strings.getCount(); i++)
+  for(unsigned int i = 0; i < strings.getCount(); i++)
     {
       TrackElement* tmpElem = this->firstTrackElem->findByName(strings.getString(i));
-      if (tmpElem)
+      if (tmpElem != NULL)
         trackIDs[i] = tmpElem->ID;
       else
+      {
         PRINTF(1)("Trying to join a Track, of which the name does not exist: %s\n", strings.getString(i));
-    }
-
+        trackIDs[i] = -1;
+      }
+    }
   this->joinV(strings.getCount(), trackIDs);
   delete []trackIDs;
@@ -905 +907 @@
   TrackElement* tmpTrackElem;
   TrackElement* tmpJoinElem;
-  for (int i = 0; i < count; i++)
+  for (unsigned int i = 0; i < count; i++)
     if (!this->firstTrackElem->findByID(trackIDs[i]))
       {
@@ -934 +936 @@
     this->setSavePoint(firstJoint);
   // Timing:
-  for (int i = 0; i < count; i++)
+  for (unsigned int i = 0; i < count; i++)
     {
       if(tmpJoinElem = this->firstTrackElem->findByID(trackIDs[i]))

trunk/src/util/track/track_manager.h

@@ -50 +50 @@
   bool backLoopCheck() const;
 
-  TrackElement* getChild(int childNumber) const;
+  TrackElement* getChild(unsigned int childNumber) const;
 
  private:

trunk/src/world_entities/npc2.cc

@@ -45 +45 @@
 {
   delete this->shader;
+  gluDeleteQuadric(this->obj);
 
 }

trunk/src/world_entities/skysphere.cc

@@ -58 +58 @@
   PRINTF(3)("Deleting the SkySphere\n");
   delete this->skyMaterial;
-  free(this->sphereObj);
+  gluDeleteQuadric(this->sphereObj);
 }