WAGE: SPlit out combat-related methods into separate file

3 files changed, 222 insertions, 168 deletions

diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
new file mode 100644
index 0000000000..102302a097
--- /dev/null
+++ b/engines/wage/combat.cpp
@@ -0,0 +1,221 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * MIT License:
+ *
+ * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "wage/wage.h"
+#include "wage/entities.h"
+#include "wage/randomhat.h"
+#include "wage/world.h"
+
+namespace Wage {
+
+Obj *WageEngine::getOffer() {
+	warning("STUB: WageEngine::getOffer");
+
+	return NULL;
+}
+
+Chr *WageEngine::getMonster() {
+	if (_monster != NULL && _monster->_currentScene != _world->_player->_currentScene) {
+		_monster = NULL;
+	}
+	return _monster;
+}
+
+void WageEngine::encounter(Chr *player, Chr *chr) {
+	Common::String msg("You encounter ");
+	if (!chr->_nameProperNoun)
+		msg += getIndefiniteArticle(chr->_name);
+	msg += chr->_name;
+	msg += ".";
+	appendText(msg);
+
+	if (!chr->_initialComment.empty())
+		appendText(chr->_initialComment);
+
+	if (chr->_armor[Chr::HEAD_ARMOR] != NULL) {
+		msg = chr->getNameWithDefiniteArticle(true);
+		msg += " is wearing ";
+		msg += getIndefiniteArticle(chr->_armor[Chr::HEAD_ARMOR]->_name);
+		msg += ".";
+		appendText(msg);
+	}
+	if (chr->_armor[Chr::BODY_ARMOR] != NULL) {
+		msg = getGenderSpecificPronoun(chr->_gender, true);
+		msg += " is protected by ";
+		msg += prependGenderSpecificPronoun(chr->_gender);
+		msg += chr->_armor[Chr::BODY_ARMOR]->_name;
+		msg += ".";
+		appendText(msg);
+	}
+	if (chr->_armor[Chr::SHIELD_ARMOR] != NULL) {
+		Obj *obj = chr->_armor[Chr::SHIELD_ARMOR];
+		msg = getGenderSpecificPronoun(chr->_gender, true);
+		msg += " carries ";
+		if (!obj->_namePlural)
+			msg += getIndefiniteArticle(obj->_name);
+		msg += obj->_name;
+		msg += ".";
+		appendText(msg);
+	}
+}
+
+void WageEngine::performCombatAction(Chr *npc, Chr *player) {
+	if (npc->_context._frozen)
+		return;
+
+	RandomHat hat;
+
+	bool winning = (npc->_context._statVariables[PHYS_HIT_CUR] > player->_context._statVariables[PHYS_HIT_CUR]);
+	int validMoves = getValidMoveDirections(npc);
+	WeaponArray *weapons = npc->getWeapons(false);
+	ObjArray *magics = npc->getMagicalObjects();
+	// TODO: Figure out under what circumstances we need to add +1
+	// for the chance (e.g. only when all values were set to 0?).
+	if (winning) {
+		if (!_world->_weaponMenuDisabled) {
+			if (weapons->size() > 0)
+				hat.addTokens(kTokWeapons, npc->_winningWeapons + 1);
+			if (magics->size() > 0)
+				hat.addTokens(kTokMagic, npc->_winningMagic);
+		}
+		if (validMoves != 0)
+			hat.addTokens(kTokRun, npc->_winningRun + 1);
+		if (npc->_inventory.size())
+			hat.addTokens(kTokOffer, npc->_winningOffer + 1);
+	} else {
+		if (!_world->_weaponMenuDisabled) {
+			if (weapons->size() > 0)
+				hat.addTokens(kTokWeapons, npc->_losingWeapons + 1);
+			if (magics->size() > 0)
+				hat.addTokens(kTokMagic, npc->_losingMagic);
+		}
+		if (validMoves != 0)
+			hat.addTokens(kTokRun, npc->_losingRun + 1);
+		if (npc->_inventory.size())
+			hat.addTokens(kTokOffer, npc->_losingOffer + 1);
+	}
+
+	Common::List<Obj *> *objs = &npc->_currentScene->_objs;
+	if (npc->_inventory.size() < npc->_maximumCarriedObjects) {
+		int cnt = 0;
+		for (ObjList::const_iterator it = objs->begin(); it != objs->end(); ++it, ++cnt) {
+			if ((*it)->_type != Obj::IMMOBILE_OBJECT) {
+				// TODO: I'm not sure what the chance should be here.
+				hat.addTokens(cnt, 123);
+			}
+		}
+	}
+
+	int token = hat.drawToken();
+	switch (token) {
+		case kTokWeapons:
+			// TODO: I think the monster should choose the "best" weapon.
+			performAttack(npc, player, weapons->operator[](_rnd->getRandomNumber(weapons->size() - 1)));
+			break;
+		case kTokMagic:
+			// TODO: I think the monster should choose the "best" magic.
+			performMagic(npc, player, magics->operator[](_rnd->getRandomNumber(magics->size() - 1)));
+			break;
+		case kTokRun:
+			performMove(npc, validMoves);
+			break;
+		case kTokOffer:
+			performOffer(npc, player);
+			break;
+		default:
+			{
+				int cnt = 0;
+				for (ObjList::const_iterator it = objs->begin(); it != objs->end(); ++it, ++cnt)
+					if (cnt == token)
+						performTake(npc, *it);
+				break;
+			}
+	}
+
+	delete weapons;
+	delete magics;
+}
+
+void WageEngine::performAttack(Chr *attacker, Chr *victim, Weapon *weapon) {
+	warning("STUB: performAttack()");
+}
+
+void WageEngine::performMagic(Chr *attacker, Chr *victim, Obj *magicalObject) {
+	warning("STUB: performMagic()");
+}
+
+void WageEngine::performMove(Chr *chr, int validMoves) {
+	warning("STUB: performMove()");
+}
+
+void WageEngine::performOffer(Chr *attacker, Chr *victim) {
+	warning("STUB: performOffer()");
+}
+
+void WageEngine::performTake(Chr *npc, Obj *obj) {
+	warning("STUB: performTake()");
+}
+
+int WageEngine::getValidMoveDirections(Chr *npc) {
+	warning("STUB: getValidMoveDirections()");
+
+	return 0;
+}
+
+void WageEngine::regen() {
+	Chr *player = _world->_player;
+	int curHp = player->_context._statVariables[PHYS_HIT_CUR];
+	int maxHp = player->_context._statVariables[PHYS_HIT_BAS];
+	int delta = maxHp - curHp;
+
+	if (delta > 0) {
+		int bonus = (int)(delta / (8 + _rnd->getRandomNumber(2)));
+		player->_context._statVariables[PHYS_HIT_CUR] += bonus;
+	}
+}
+
+} // End of namespace Wage
diff --git a/engines/wage/module.mk b/engines/wage/module.mk
index 216ac528fa..8229d1745c 100644
--- a/engines/wage/module.mk
+++ b/engines/wage/module.mk
@@ -1,6 +1,7 @@
 MODULE := engines/wage
 
 MODULE_OBJS := \
+	combat.o \
 	design.o \
 	detection.o \
 	entities.o \
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index f0690f565d..da29a20eb6 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -58,10 +58,8 @@
 #include "gui/EventRecorder.h"
 
 #include "wage/wage.h"
-#include "wage/design.h"
 #include "wage/entities.h"
 #include "wage/gui.h"
-#include "wage/randomhat.h"
 #include "wage/script.h"
 #include "wage/world.h"
 
@@ -217,19 +215,6 @@ void WageEngine::appendText(String &str) {
 	_gui->appendText(str);
 }
 
-Obj *WageEngine::getOffer() {
-	warning("STUB: WageEngine::getOffer");
-
-	return NULL;
-}
-
-Chr *WageEngine::getMonster() {
-	if (_monster != NULL && _monster->_currentScene != _world->_player->_currentScene) {
-		_monster = NULL;
-	}
-	return _monster;
-}
-
 void WageEngine::gameOver() {
 	warning("STUB: WageEngine::gameOver()");
 }
@@ -360,147 +345,6 @@ void WageEngine::onMove(Designed *what, Designed *from, Designed *to) {
 	}
 }
 
-void WageEngine::encounter(Chr *player, Chr *chr) {
-	Common::String msg("You encounter ");
-	if (!chr->_nameProperNoun)
-		msg += getIndefiniteArticle(chr->_name);
-	msg += chr->_name;
-	msg += ".";
-	appendText(msg);
-
-	if (!chr->_initialComment.empty())
-		appendText(chr->_initialComment);
-
-	if (chr->_armor[Chr::HEAD_ARMOR] != NULL) {
-		msg = chr->getNameWithDefiniteArticle(true);
-		msg += " is wearing ";
-		msg += getIndefiniteArticle(chr->_armor[Chr::HEAD_ARMOR]->_name);
-		msg += ".";
-		appendText(msg);
-	}
-	if (chr->_armor[Chr::BODY_ARMOR] != NULL) {
-		msg = getGenderSpecificPronoun(chr->_gender, true);
-		msg += " is protected by ";
-		msg += prependGenderSpecificPronoun(chr->_gender);
-		msg += chr->_armor[Chr::BODY_ARMOR]->_name;
-		msg += ".";
-		appendText(msg);
-	}
-	if (chr->_armor[Chr::SHIELD_ARMOR] != NULL) {
-		Obj *obj = chr->_armor[Chr::SHIELD_ARMOR];
-		msg = getGenderSpecificPronoun(chr->_gender, true);
-		msg += " carries ";
-		if (!obj->_namePlural)
-			msg += getIndefiniteArticle(obj->_name);
-		msg += obj->_name;
-		msg += ".";
-		appendText(msg);
-	}
-}
-
-void WageEngine::performCombatAction(Chr *npc, Chr *player) {
-	if (npc->_context._frozen)
-		return;
-
-	RandomHat hat;
-
-	bool winning = (npc->_context._statVariables[PHYS_HIT_CUR] > player->_context._statVariables[PHYS_HIT_CUR]);
-	int validMoves = getValidMoveDirections(npc);
-	WeaponArray *weapons = npc->getWeapons(false);
-	ObjArray *magics = npc->getMagicalObjects();
-	// TODO: Figure out under what circumstances we need to add +1
-	// for the chance (e.g. only when all values were set to 0?).
-	if (winning) {
-		if (!_world->_weaponMenuDisabled) {
-			if (weapons->size() > 0)
-				hat.addTokens(kTokWeapons, npc->_winningWeapons + 1);
-			if (magics->size() > 0)
-				hat.addTokens(kTokMagic, npc->_winningMagic);
-		}
-		if (validMoves != 0)
-			hat.addTokens(kTokRun, npc->_winningRun + 1);
-		if (npc->_inventory.size())
-			hat.addTokens(kTokOffer, npc->_winningOffer + 1);
-	} else {
-		if (!_world->_weaponMenuDisabled) {
-			if (weapons->size() > 0)
-				hat.addTokens(kTokWeapons, npc->_losingWeapons + 1);
-			if (magics->size() > 0)
-				hat.addTokens(kTokMagic, npc->_losingMagic);
-		}
-		if (validMoves != 0)
-			hat.addTokens(kTokRun, npc->_losingRun + 1);
-		if (npc->_inventory.size())
-			hat.addTokens(kTokOffer, npc->_losingOffer + 1);
-	}
-
-	Common::List<Obj *> *objs = &npc->_currentScene->_objs;
-	if (npc->_inventory.size() < npc->_maximumCarriedObjects) {
-		int cnt = 0;
-		for (ObjList::const_iterator it = objs->begin(); it != objs->end(); ++it, ++cnt) {
-			if ((*it)->_type != Obj::IMMOBILE_OBJECT) {
-				// TODO: I'm not sure what the chance should be here.
-				hat.addTokens(cnt, 123);
-			}
-		}
-	}
-
-	int token = hat.drawToken();
-	switch (token) {
-		case kTokWeapons:
-			// TODO: I think the monster should choose the "best" weapon.
-			performAttack(npc, player, weapons->operator[](_rnd->getRandomNumber(weapons->size() - 1)));
-			break;
-		case kTokMagic:
-			// TODO: I think the monster should choose the "best" magic.
-			performMagic(npc, player, magics->operator[](_rnd->getRandomNumber(magics->size() - 1)));
-			break;
-		case kTokRun:
-			performMove(npc, validMoves);
-			break;
-		case kTokOffer:
-			performOffer(npc, player);
-			break;
-		default:
-			{
-				int cnt = 0;
-				for (ObjList::const_iterator it = objs->begin(); it != objs->end(); ++it, ++cnt)
-					if (cnt == token)
-						performTake(npc, *it);
-				break;
-			}
-	}
-
-	delete weapons;
-	delete magics;
-}
-
-void WageEngine::performAttack(Chr *attacker, Chr *victim, Weapon *weapon) {
-	warning("STUB: performAttack()");
-}
-
-void WageEngine::performMagic(Chr *attacker, Chr *victim, Obj *magicalObject) {
-	warning("STUB: performMagic()");
-}
-
-void WageEngine::performMove(Chr *chr, int validMoves) {
-	warning("STUB: performMove()");
-}
-
-void WageEngine::performOffer(Chr *attacker, Chr *victim) {
-	warning("STUB: performOffer()");
-}
-
-void WageEngine::performTake(Chr *npc, Obj *obj) {
-	warning("STUB: performTake()");
-}
-
-int WageEngine::getValidMoveDirections(Chr *npc) {
-	warning("STUB: getValidMoveDirections()");
-
-	return 0;
-}
-
 void WageEngine::redrawScene() {
 	Scene *currentScene = _world->_player->_currentScene;
 	if (currentScene != NULL) {
@@ -518,18 +362,6 @@ void WageEngine::redrawScene() {
 	}
 }
 
-void WageEngine::regen() {
-	Chr *player = _world->_player;
-	int curHp = player->_context._statVariables[PHYS_HIT_CUR];
-	int maxHp = player->_context._statVariables[PHYS_HIT_BAS];
-	int delta = maxHp - curHp;
-
-	if (delta > 0) {
-		int bonus = (int)(delta / (8 + _rnd->getRandomNumber(2)));
-		player->_context._statVariables[PHYS_HIT_CUR] += bonus;
-	}
-}
-
 void WageEngine::processTurnInternal(Common::String *textInput, Designed *clickInput) {
 	Scene *playerScene = _world->_player->_currentScene;
 	if (playerScene == _world->_storageScene)