Changeset 10435 for code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc

Timestamp:

May 7, 2015, 5:43:36 PM (9 years ago)

Author:

meggiman

Message:

Added new models and fixed dammage bug. Bomb now fully working.

File:

• code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc (modified) (4 diffs)

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc

@@ -12 +12 @@
         RegisterClass(GravityBomb);
 
+        const float GravityBomb::LIFETIME = 5;
+
         GravityBomb::GravityBomb(Context* context):
                                 BasicProjectile(),
@@ -24 +26 @@
                         {
                                 //Define CollisionType of the bomb
-                                this->timeToLife_= 5;
+                                this->timeToLife_= LIFETIME;
                                 this->setCollisionResponse(false);
                                 this->setCollisionType(WorldEntity::Dynamic);
@@ -35 +37 @@
 
                                 //Create Bomb Model
-                    Model* model = new Model(this->getContext());
-                    model->setMeshSource("rocket.mesh"); //Demo Model from SimpleRocket
-                    model->scale(0.7f);
-                    this->attach(model);
+                    Model* rocketModel = new Model(this->getContext());
+                    rocketModel->setMeshSource("GravityBombRocket.mesh"); //Demo Model from SimpleRocket
+                    rocketModel->scale(3.0f);
+                    this->attach(rocketModel);
+
+                    Model* bombModel =  new Model(this->getContext());
+                    bombModel->setMeshSource("GravityBomb.mesh"); //Demo Model from SimpleRocket
+                                bombModel->scale(3.0f);
+                                this->attach(bombModel);
 
                         }
@@ -82 +89 @@
         {
                 GravityBombField* field = new GravityBombField(this->getContext());
+                field->setShooter(this->getShooter());
                 field->setPosition(getPosition());
                 orxout(debug_output) << "detonating. Creating GravityBombField." <<endl;