Changeset 5313 in orxonox.OLD for trunk/src/util
- Timestamp:
- Oct 8, 2005, 2:07:42 AM (19 years ago)
- Location:
- trunk/src/util/track
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/util/track/track_manager.cc
r5129 r5313 105 105 tIterator<TrackElement>* iterator = this->children->getIterator(); 106 106 TrackElement* enumElem = iterator->firstElement(); 107 TrackElement* tmpElem ;107 TrackElement* tmpElem = NULL; 108 108 while (enumElem) 109 109 { 110 if ((tmpElem = enumElem->findByID(trackID)) )110 if ((tmpElem = enumElem->findByID(trackID)) != NULL) 111 111 return tmpElem; 112 112 enumElem = iterator->nextElement(); … … 196 196 Be aware, that when the trackElement has no Children, NULL will be returned 197 197 */ 198 TrackElement* TrackElement::getChild( int childCount) const198 TrackElement* TrackElement::getChild(unsigned int childCount) const 199 199 { 200 200 // if the the trackElement has no children return NULL. … … 207 207 tIterator<TrackElement>* iterator = this->children->getIterator(); 208 208 TrackElement* enumElem = iterator->firstElement(); 209 for ( int i = 0; i < childCount; i++)209 for (unsigned int i = 0; i < childCount; i++) 210 210 enumElem = iterator->nextElement(); 211 211 delete iterator; … … 881 881 this->joinV(strings.getCount(), trackIDs); 882 882 883 for( int i = 0; i < strings.getCount(); i++)883 for(unsigned int i = 0; i < strings.getCount(); i++) 884 884 { 885 885 TrackElement* tmpElem = this->firstTrackElem->findByName(strings.getString(i)); 886 if (tmpElem )886 if (tmpElem != NULL) 887 887 trackIDs[i] = tmpElem->ID; 888 888 else 889 { 889 890 PRINTF(1)("Trying to join a Track, of which the name does not exist: %s\n", strings.getString(i)); 890 } 891 891 trackIDs[i] = -1; 892 } 893 } 892 894 this->joinV(strings.getCount(), trackIDs); 893 895 delete []trackIDs; … … 905 907 TrackElement* tmpTrackElem; 906 908 TrackElement* tmpJoinElem; 907 for ( int i = 0; i < count; i++)909 for (unsigned int i = 0; i < count; i++) 908 910 if (!this->firstTrackElem->findByID(trackIDs[i])) 909 911 { … … 934 936 this->setSavePoint(firstJoint); 935 937 // Timing: 936 for ( int i = 0; i < count; i++)938 for (unsigned int i = 0; i < count; i++) 937 939 { 938 940 if(tmpJoinElem = this->firstTrackElem->findByID(trackIDs[i])) -
trunk/src/util/track/track_manager.h
r5014 r5313 50 50 bool backLoopCheck() const; 51 51 52 TrackElement* getChild( int childNumber) const;52 TrackElement* getChild(unsigned int childNumber) const; 53 53 54 54 private:
Note: See TracChangeset
for help on using the changeset viewer.