Changeset 8761 for code/branches

Timestamp:

Jul 15, 2011, 10:49:17 AM (13 years ago)

Author:

jo

Message:

Error due to block scope (variables didn't reset in the inner while loops).

File:

• code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) (3 diffs)

code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -49 +48 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/Weapon.h"
-
+#include "weaponsystem/WeaponSlot.h"
 
 namespace orxonox
@@ -1137 +1136 @@
     void ArtificialController::analyseWeapons(Pawn* pawn)
     {
-        int max=10, i=0, j=0, k=0;
+        int max = 10;
         if(!pawn) return;
-        while(i<max)
-        {
-            WeaponPack* wPack = pawn->getWeaponPack(i); //WeaponSet* wSet = pawn->getWeaponSet(i);
-            i++;
-            if(wPack==NULL) continue;
-            while(j<max)
-            {
-                Weapon* wpn = wPack->getWeapon(j);
-                j++;
-                if(wpn==NULL) continue;
-                while(k<max)
-                {
-                    WeaponMode* wMode = wpn->getWeaponmode(k);
-                    k++;
-                    if(wMode==NULL) continue;
-                    COUT(0)<<wMode->getIdentifier()->getName()<<": weaponpack "+multi_cast<std::string>(i-1)<<", weapon "<<multi_cast<std::string>(j-1)<<", weaponmode "<<multi_cast<std::string>(k-1)<<std::endl;
-                }
+        for(int l=0; l<max ;l++)
+        {
+            WeaponSlot* wSlot = pawn->getWeaponSlot(l);
+            if(wSlot==NULL) continue;//{COUT(0)<<"WEAPONSLOT "<<l<< " failed"<<endl; continue;}
+            for(int i=0; i<max; i++)
+            {
+                 WeaponMode* wMode = wSlot->getWeapon()->getWeaponmode(i);
+                 if(wMode==NULL) continue;//{COUT(0)<<"WEAPONMODE "<<i<< " failed"<<endl;}
+                 COUT(0)<<wMode->getIdentifier()->getName()<< " using mode:"<<i<<endl;
             }
         }