Extract method

arx · Jun 13, 2014 · 899ab46 · 899ab46
1 parent 77ac3ca
commit 899ab46
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/game/Spells.cpp b/src/game/Spells.cpp
@@ -218,6 +218,16 @@ SpellBase * SpellManager::getSpellOnTarget(EntityHandle target, SpellType type)
 	return NULL;
 }
 
+void SpellManager::replaceCaster(EntityHandle oldCaster, EntityHandle newCaster) {
+	for(size_t i = 0; i < MAX_SPELLS; i++) {
+		SpellBase * spell = spells[SpellHandle(i)];
+
+		if(spell->m_exist && spell->m_caster == oldCaster) {
+			spell->m_caster = newCaster;
+		}
+	}
+}
+
 
 bool GetSpellPosition(Vec3f * pos, SpellBase * spell)
 {

diff --git a/src/game/Spells.h b/src/game/Spells.h
@@ -78,7 +78,8 @@ class SpellManager {
 	bool ExistAnyInstanceForThisCaster(SpellType typ, EntityHandle caster);
 
 	SpellBase * getSpellOnTarget(EntityHandle target, SpellType type);
-
+
+	void replaceCaster(EntityHandle oldCaster, EntityHandle newCaster);
 private:
 	SpellBase m_spells[MAX_SPELLS];
 };

diff --git a/src/script/ScriptedIOControl.cpp b/src/script/ScriptedIOControl.cpp
@@ -122,14 +122,7 @@ class ReplaceMeCommand : public Command {
 				CheckForInventoryReplaceMe(ioo, io);
 			}
 		} else {
-
-			for(size_t i = 0; i < MAX_SPELLS; i++) {
-				SpellBase * spell = spells[SpellHandle(i)];
-
-				if(spell->m_exist && spell->m_caster == oldd) {
-					spell->m_caster = neww;
-				}
-			}
+			spells.replaceCaster(oldd, neww);
 
 			InventoryPos oldPos = removeFromInventories(io);