Changeset 6137 in orxonox.OLD for branches/objectmanager/src/lib

Timestamp:

Dec 16, 2005, 6:10:59 PM (19 years ago)

Author:

bensch

Message:

om: linkage-fixes in the WeaponManager

Location:

branches/objectmanager/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (2 diffs)
• coord/p_node.h (modified) (1 diff)

branches/objectmanager/src/lib/collision_detection/cd_engine.cc

@@ -116 +116 @@
   while (pre1 != list1.end())
   {
-    entity1 = pre1;
-    pre1++;
+    entity1 = pre1++;
     if( likely((*entity1) != this->terrain))
     {
@@ -123 +122 @@
       while (pre2 != list2.end())
       {
-        entity2 = pre2;
-        pre2++;
+        entity2 = pre2++;
         if( likely((*entity2) != this->terrain))
         {

branches/objectmanager/src/lib/coord/p_node.h

@@ -79 +79 @@
 
   // ACTIVATION //
-  inline void activateNode() { this->bActive = true; };
+  inline void activateNode() { this->bActive = this->bRelCoorChanged = this->bRelDirChanged = true; };
   inline void deactivateNode() { this->bActive = false; };
   inline bool getNodeActiveState() { return this->bActive; };