Changeset 2273 for code/branches/weapon2

Timestamp:

Nov 26, 2008, 3:01:59 PM (16 years ago)

Author:

polakma

Message:

small changes for tests

Location:

code/branches/weapon2/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/weapon2/src/orxonox/gamestates/GSLevel.cc

@@ -51 +51 @@
 namespace orxonox
 {
-    SetCommandLineArgument(level, "sample2.oxw").shortcut("l");
+    SetCommandLineArgument(level, "sample4.oxw").shortcut("l");
 
     GSLevel::GSLevel()

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -56 +56 @@
         //WeaponSystem
         weaponSystem_ = new WeaponSystem(this);
-        /*
-        WeaponSet * weaponSet1 = new WeaponSet(1);
+        WeaponSet * weaponSet1 = new WeaponSet(this,1);
         this->weaponSystem_->attachWeaponSet(weaponSet1);
-        this->weaponSystem_->getWeaponSetPointer(0)->getWeaponSlotPointer(0)->setAmmoType(true);
-        */
+
 
         this->registerVariables();