[Orxonox-commit 3864] r8538 - in code/branches/gameimmersion: data/levels/includes src/modules/weapons/projectiles
simonmie at orxonox.net
simonmie at orxonox.net
Mon May 23 15:09:08 CEST 2011
Author: simonmie
Date: 2011-05-23 15:09:07 +0200 (Mon, 23 May 2011)
New Revision: 8538
Modified:
code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi
code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc
code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h
code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc
code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h
code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc
code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h
code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc
code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h
Log:
some comments in test-Weaponsettings made
Modified: code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi
===================================================================
--- code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi 2011-05-23 13:09:07 UTC (rev 8538)
@@ -17,6 +17,10 @@
<DefaultWeaponmodeLink firemode=2 weaponmode=2 />
<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>
<Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" />
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.cc 2011-05-23 13:09:07 UTC (rev 8538)
@@ -48,7 +48,6 @@
RegisterRootObject(BasicProjectile);// - register the BasicProjectile class to the core
this->bDestroy_ = false;
-// this->owner_ = 0;
this->damage_ = 0;
this->healthdamage_ = 0;
@@ -126,13 +125,8 @@
return false;
}
-/* void BasicProjectile::setOwner(Pawn* owner)
+/* void BasicProjectile::destroyObject()
{
- this->owner_ = owner;
- }
-
- void BasicProjectile::destroyObject()
- {
if (GameMode::isMaster())
this->destroy();
}
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/BasicProjectile.h 2011-05-23 13:09:07 UTC (rev 8538)
@@ -47,11 +47,6 @@
void basicDestroyObject();
-/* void basicSetOwner(Pawn* owner);
- inline Pawn* basicGetOwner() const
- { return this->owner_; }
-*/
-
inline void setDamage(float damage)
{ this->damage_ = damage; }
inline float getDamage() const
@@ -74,9 +69,8 @@
{ return this->bDestroy_; }
-
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_;
float healthdamage_;
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc 2011-05-23 13:09:07 UTC (rev 8538)
@@ -46,7 +46,7 @@
this->setConfigValues();
// this->bDestroy_ = false;
- this->owner_ = 0;
+// this->owner_ = 0;
// this->damage_ = 115;
///////////////////me
// this->healthdamage_ = 0;
@@ -99,7 +99,7 @@
bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
- return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+ return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
}
//////////////////////////me edit
@@ -159,5 +159,4 @@
{
this->owner_ = owner;
}
-
}
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h 2011-05-23 13:09:07 UTC (rev 8538)
@@ -55,6 +55,8 @@
inline float getDamage() const
{ return this->damage_; }
*/
+
+
void setOwner(Pawn* owner);
inline Pawn* getOwner() const
{ return this->owner_; }
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc 2011-05-23 13:09:07 UTC (rev 8538)
@@ -147,8 +147,8 @@
void Rocket::setOwner(Pawn* owner)
{
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() )
{
@@ -184,7 +184,7 @@
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())
{
@@ -245,10 +245,10 @@
void Rocket::destructionEffect()
{
ParticleSpawner *effect1, *effect2;
- if( this->owner_ )
+ if( this->getOwner() )
{
- effect1 = new ParticleSpawner(this->owner_->getCreator());
- effect2 = new ParticleSpawner(this->owner_->getCreator());
+ effect1 = new ParticleSpawner(this->getOwner()->getCreator());
+ effect2 = new ParticleSpawner(this->getOwner()->getCreator());
}
else
{
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h 2011-05-23 13:09:07 UTC (rev 8538)
@@ -110,12 +110,6 @@
inline Pawn* getOwner() const
{ return this->owner_; }
-/* inline void setDamage(float damage)
- { this->damage_ = damage; }
- inline float getDamage() const
- { return this->damage_; }
-*/
-
virtual void fired(unsigned int firemode);
private:
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc 2011-05-23 13:09:07 UTC (rev 8538)
@@ -158,7 +158,7 @@
void SimpleRocket::setOwner(Pawn* owner)
{
this->owner_ = owner;
- this->player_ = this->owner_->getPlayer();
+ this->player_ = this->getOwner()->getPlayer();
}
@@ -166,7 +166,7 @@
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())
{
if (otherObject == this->owner_)
Modified: code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h 2011-05-23 13:06:08 UTC (rev 8537)
+++ code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.h 2011-05-23 13:09:07 UTC (rev 8538)
@@ -112,14 +112,10 @@
void setOwner(Pawn* owner);
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:
WeakPtr<Pawn> owner_;
More information about the Orxonox-commit
mailing list