Changeset 8538

Timestamp:

May 23, 2011, 3:09:07 PM (13 years ago)

Author:

simonmie

Message:

some comments in test-Weaponsettings made

Location:

code/branches/gameimmersion

Files:

• data/levels/includes/weaponSettingsImmTest.oxi (modified) (1 diff)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/BasicProjectile.h (modified) (2 diffs)
• src/modules/weapons/projectiles/Projectile.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/Projectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (modified) (1 diff)

code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi

@@ -18 +18 @@
           <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
         </links>
+            <!-- HsW01 is the standard Weapon, 4 slots => 4 Projectiles spawned at one click -->
+            <!-- LightningGun is the spiral weapon, 2 slots -->
+            <!-- SimpleRocket is the target-following rocket -->
+            <!-- Rocket is the player-guided rocket -->
         <Weapon>
           <attached>

code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -49 +49 @@
 
         this->bDestroy_ = false;
-//        this->owner_ = 0;
 
         this->damage_ = 0;
@@ -127 +126 @@
     }
 
-/*    void BasicProjectile::setOwner(Pawn* owner)
-    {
-        this->owner_ = owner;
-    }
-
-    void BasicProjectile::destroyObject()
+/*    void BasicProjectile::destroyObject()
     {
         if (GameMode::isMaster())

code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h

@@ -48 +48 @@
             void basicDestroyObject();
 
-/*            void basicSetOwner(Pawn* owner);
-            inline Pawn* basicGetOwner() const
-                { return this->owner_; }
-*/
-
             inline void setDamage(float damage)
                 { this->damage_ = damage;  }
@@ -75 +70 @@
 
 
-
         private:
-//            WeakPtr<Pawn> owner_;
+//            WeakPtr<Pawn> owner_; //owner cannot be set in BasicProjectile, because it's already defined in MobileEntity and Movable Entity
 
             float damage_;

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc

@@ -47 +47 @@
         this->setConfigValues();
 //        this->bDestroy_ = false;
-        this->owner_ = 0;
+//        this->owner_ = 0;
 //        this->damage_ = 115;
 ///////////////////me
@@ -100 +100 @@
     bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
     }
 
@@ -160 +160 @@
         this->owner_ = owner;
     }
-
 }

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h

@@ -56 +56 @@
                 { return this->damage_; }
 */
+
+
             void setOwner(Pawn* owner);
             inline Pawn* getOwner() const

code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc

@@ -148 +148 @@
     {
         this->owner_ = owner;
-        this->player_ = this->owner_->getPlayer();
-        this->owner_->getPlayer()->startTemporaryControl(this);
+        this->player_ = this->getOwner()->getPlayer();
+        this->getOwner()->getPlayer()->startTemporaryControl(this);
 
         if( GameMode::isMaster() )
@@ -185 +185 @@
     bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
 
 /* * /        if (!this->bDestroy_ && GameMode::isMaster())
@@ -246 +246 @@
     {
         ParticleSpawner *effect1, *effect2;
-        if( this->owner_ )
-        {
-            effect1 = new ParticleSpawner(this->owner_->getCreator());
-            effect2 = new ParticleSpawner(this->owner_->getCreator());
+        if( this->getOwner() )
+        {
+            effect1 = new ParticleSpawner(this->getOwner()->getCreator());
+            effect2 = new ParticleSpawner(this->getOwner()->getCreator());
         }
         else

code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h

@@ -111 +111 @@
                 { return this->owner_; }
 
-/*            inline void setDamage(float damage)
-                { this->damage_ = damage; }
-            inline float getDamage() const
-                { return this->damage_; }
-*/
-
             virtual void fired(unsigned int firemode);
 

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

@@ -159 +159 @@
     {
         this->owner_ = owner;
-        this->player_ = this->owner_->getPlayer();
+        this->player_ = this->getOwner()->getPlayer();
     }
 
@@ -167 +167 @@
     bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
 /*        if (!this->bDestroy_ && GameMode::isMaster())
         {

code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h

@@ -113 +113 @@
             inline Pawn* getOwner() const
                 { return this->owner_; }
+
             inline bool hasFuel() const
             { return this->fuel_; }
 
-/*            inline void setDamage(float damage)
-                { this->damage_ = damage; }
-            inline float getDamage() const
-                { return this->damage_; }
-*/
 
         private: