WAGE: Implement performMagic()

scummvm · Feb 14, 2016 · b70ae62 · b70ae62
1 parent c76b7ec
commit b70ae62
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
@@ -237,10 +237,24 @@ void WageEngine::decrementUses(Obj *obj) {
 
 bool WageEngine::attackHit(Chr *attacker, Chr *victim, Obj *weapon, int targetIndex) {
 	warning("STUB: attackHit");
+
+	return false;
 }
 
 void WageEngine::performMagic(Chr *attacker, Chr *victim, Obj *magicalObject) {
-	warning("STUB: performMagic()");
+	switch (magicalObject->_attackType) {
+	case Obj::HEALS_PHYSICAL_DAMAGE:
+	case Obj::HEALS_SPIRITUAL_DAMAGE:
+	case Obj::HEALS_PHYSICAL_AND_SPIRITUAL_DAMAGE:
+		performHealingMagic(attacker, magicalObject);
+		return;
+	}
+
+	performAttack(attacker, victim, magicalObject);
+}
+
+void WageEngine::performHealingMagic(Chr *chr, Obj *magicalObject) {
+	warning("STUB: performHealingMagic()");
 }
 
 void WageEngine::performMove(Chr *chr, int validMoves) {

diff --git a/engines/wage/wage.h b/engines/wage/wage.h
@@ -137,6 +137,7 @@ class WageEngine : public Engine {
 	void performTake(Chr *npc, Obj *obj);
 	void decrementUses(Obj *obj);
 	bool attackHit(Chr *attacker, Chr *victim, Obj *weapon, int targetIndex);
+	void performHealingMagic(Chr *chr, Obj *magicalObject);
 
 	void doClose();