Changeset 6951 for code/branches/presentation3/src/modules/weapons/projectiles

Timestamp:

May 21, 2010, 10:25:27 AM (15 years ago)

Author:

scheusso

Message:

merged rocket branch into presentation3 and cleaned up some things (mostly debug output and intendation)

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.cc (copied) (copied from code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc) (6 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (copied) (copied from code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h)

code/branches/presentation3/src/modules/weapons/projectiles/CMakeLists.txt

@@ -5 +5 @@
   LightningGunProjectile.cc
   Rocket.cc
+  SimpleRocket.cc
 )

code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -59 +59 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
-                COUT(0)<< "simplerocket constructed\n";
+        COUT(4) << "simplerocket constructed\n";
 
 
@@ -91 +91 @@
 
     }
-        void SimpleRocket::tick(float dt)
+    
+    void SimpleRocket::tick(float dt)
     {
         SUPER(SimpleRocket, tick, dt);
@@ -102 +103 @@
                 this->destroy();
         
-        }
+    }
 
     /**s
@@ -110 +111 @@
     SimpleRocket::~SimpleRocket()
     {
-                if (this->isInitialized()) {
-                        this->getController()->destroy();
-                COUT(0)<< "simplerocket destroyed\n";
-                }
-        }
+        if (this->isInitialized()) 
+        {
+            this->getController()->destroy();
+            COUT(4)<< "simplerocket destroyed\n";
+        }
+    }
 
     /**
@@ -165 +167 @@
 
             float dmg = this->damage_;
-            if (this->owner_)
-                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+//             if (this->owner_)
+//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
@@ -182 +184 @@
         }
     }
-        void SimpleRocket::setDestroy() {
-                this->bDestroy_=true;
-                COUT(0)<<"trying to destroy";
-        }
+    
+    void SimpleRocket::setDestroy()
+    {
+        this->bDestroy_=true;
+        CCOUT(4)<<"trying to destroy";
+    }
 
     void SimpleRocket::fired(unsigned int firemode)