Changeset 3840 in orxonox.OLD for orxonox

Timestamp:

Apr 16, 2005, 11:35:33 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: preventing joining from join, IF and only if one trackElement is not found

Location:

orxonox/trunk/src

Files:

• lib/graphics/text_engine.cc (modified) (1 diff)
• track_manager.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -265 +265 @@
   
   this->setSize(fontSize);
+
+  this->setFont(fontFile);
+
   this->setStyle("c");//TTF_STYLE_NORMAL);
-
-  this->setFont(fontFile);
-
 
   this->setFastColor(r, g, b);

orxonox/trunk/src/track_manager.cc

@@ -715 +715 @@
 void TrackManager::joinV(unsigned int count, int* trackIDs)
 {
+  TrackElement* tmpTrackElem;
+  for (int i = 0; i < count; i++)
+    if (!this->firstTrackElem->findByID(trackIDs[i]))
+      {
+        PRINTF(1)("Error trying to Connect Paths that do not exist yet: %d\n Not Joining Anything", trackIDs[i]);
+        return;
+      }
+                  
+
   PRINTF(3)("Joining %d tracks and merging to Track %d\n", count, trackIDs[0]);
 
   // checking if there is a back-loop-connection and ERROR if it is.
-  TrackElement* tmpTrackElem = this->firstTrackElem->findByID(trackIDs[0]);
+  tmpTrackElem = this->firstTrackElem->findByID(trackIDs[0]);
   if (!tmpTrackElem->backLoopCheck(tmpTrackElem))
     {