Changeset 5131 in orxonox.OLD for trunk/src

Timestamp:

Aug 26, 2005, 11:18:24 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: modified the tList-template again.

prais patrick who's holy omnipotence was such that i could never reach

Location:

trunk/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (1 diff)
• util/list.h (modified) (4 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -100 +100 @@
         ////////////////
 
-/*        if( likely(entity2 != this->terrain))
+        if( likely(entity2 != this->terrain))
         {
           PRINTF(4)("checking object %s against %s\n", entity1->getName(), entity2->getName());
           tree = entity1->getOBBTree();
           if( likely(tree != NULL) && entity2->getOBBTree() != NULL) tree->collideWith(entity1, entity2);
-        }*/
+        }
         entity2 = iterator2->nextElement();
       }

trunk/src/lib/util/list.h

@@ -382 +382 @@
     inline T* tIterator<T>::firstElement ()
 {
-  this->currentEl = this->list->first;
-  if (this->currentEl != NULL)
-    return this->currentEl->curr;
+  this->tmpEl = this->list->first;
+  if (this->tmpEl != NULL)
+  {
+    this->currentEl = this->tmpEl->next;
+    return this->tmpEl->curr;
+  }
   else
     return NULL;
@@ -392 +395 @@
     inline T* tIterator<T>::lastElement ()
 {
-  this->currentEl = this->list->last;
-  if (this->currentEl != NULL)
-    return this->currentEl->curr;
+  this->tmpEl = this->list->last;
+  if (this->tmpEl != NULL)
+  {
+    this->currentEl = tmpEl->prev;
+    return this->tmpEl->curr;
+  }
   else
     return NULL;
@@ -410 +416 @@
     return NULL;
 
+  this->tmpEl = this->currentEl;
   this->currentEl = this->currentEl->next;
-  if (this->currentEl != NULL)
-    return this->currentEl->curr;
-  else
-    return NULL;
+
+  return this->tmpEl->curr;
 }
 
@@ -427 +432 @@
     return NULL;
 
+  this->tmpEl = this->currentEl;
   this->currentEl = this->currentEl->prev;
-  if (this->currentEl != NULL)
-    return this->currentEl->curr;
-  else
-    return NULL;
+
+  return this->tmpEl->curr;
 }