Remove spell handle from repel undead spell effect

arx · Jun 9, 2014 · eeb41b6 · eeb41b6
1 parent 32c215d
commit eeb41b6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/src/game/magic/spells/SpellsLvl05.cpp b/src/game/magic/spells/SpellsLvl05.cpp
@@ -212,7 +212,6 @@ void RepelUndeadSpell::Launch()
 	m_fManaCostPerSecond = 1.f;
 
 	CRepelUndead * effect = new CRepelUndead();
-	effect->spellinstance = m_thisHandle;
 	effect->Create(player.pos, MAKEANGLE(player.angle.getPitch()));
 	effect->SetDuration(m_tolive);
 	m_pSpellFx = effect;
@@ -234,9 +233,22 @@ void RepelUndeadSpell::End()
 
 void RepelUndeadSpell::Update(float timeDelta)
 {
-	if(m_pSpellFx) {
-		m_pSpellFx->Update(timeDelta);
-		m_pSpellFx->Render();
+	CRepelUndead * effect = static_cast<CRepelUndead *>(m_pSpellFx);
+
+	if(effect) {
+		Vec3f pos = entities[m_target]->pos;
+
+		float rot;
+		if(m_target == PlayerEntityHandle) {
+			rot = player.angle.getPitch();
+		} else {
+			rot = entities[m_target]->angle.getPitch();
+		}
+
+		effect->SetPos(pos);
+		effect->SetRotation(rot);
+		effect->Update(timeDelta);
+		effect->Render();
 
 		if (m_target == PlayerEntityHandle)
 			ARX_SOUND_RefreshPosition(m_snd_loop, entities[m_target]->pos);

diff --git a/src/graphics/spells/Spells05.cpp b/src/graphics/spells/Spells05.cpp
@@ -865,30 +865,17 @@ void CRepelUndead::Create(Vec3f aeSrc, float afBeta) {
 	SetAngle(afBeta);
 }
 
-void CRepelUndead::SetPos(const Vec3f & pos)
-{
-
+void CRepelUndead::SetPos(const Vec3f & pos) {
+	eSrc = pos;
 }
 
-void CRepelUndead::SetRotation(float rotation)
-{
-
+void CRepelUndead::SetRotation(float rotation) {
+	fBeta = rotation;
 }
 
 void CRepelUndead::Update(unsigned long _ulTime) {
 
 	ulCurrentTime += _ulTime;
-	if(spellinstance < 0) {
-		return;
-	}
-
-	eSrc = entities[spells[spellinstance]->m_target]->pos;
-
-	if(spells[spellinstance]->m_target == PlayerEntityHandle) {
-		fBeta = player.angle.getPitch();
-	} else {
-		fBeta = entities[spells[spellinstance]->m_target]->angle.getPitch();
-	}
 }
 
 void CRepelUndead::Render() {

diff --git a/src/graphics/spells/Spells05.h b/src/graphics/spells/Spells05.h
@@ -199,7 +199,6 @@ class CRepelUndead : public CSpellFx {
 	void Update(unsigned long);
 	void Render();
 
-	SpellHandle spellinstance;
 private:
 	Vec3f eSrc;
 	TextureContainer * tex_p2;