diff options
author | Eugene Sandulenko | 2016-01-21 08:48:36 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2016-02-14 17:12:49 +0100 |
commit | c7eed7f0ad4b3c23694c1b97578a4b8b86be54f9 (patch) | |
tree | 5c0fa0b6c8cc52be64e3779258872e1e4a2d8f22 /engines/wage/script.cpp | |
parent | efdf51d3ddbb89f2fc1858c9f13ee6bb1a8b005a (diff) | |
download | scummvm-rg350-c7eed7f0ad4b3c23694c1b97578a4b8b86be54f9.tar.gz scummvm-rg350-c7eed7f0ad4b3c23694c1b97578a4b8b86be54f9.tar.bz2 scummvm-rg350-c7eed7f0ad4b3c23694c1b97578a4b8b86be54f9.zip |
WAGE: Implement getWeapons(). Got rid of class Weapon
Diffstat (limited to 'engines/wage/script.cpp')
-rw-r--r-- | engines/wage/script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp index 6ccb7b3696..52e0dbf4c3 100644 --- a/engines/wage/script.cpp +++ b/engines/wage/script.cpp @@ -199,8 +199,8 @@ bool Script::execute(World *world, int loopCount, String *inputText, Designed *i handleAcceptCommand(); } else { Chr *player = _world->_player; - WeaponArray *weapons = player->getWeapons(true); - for (WeaponArray::const_iterator weapon = weapons->begin(); weapon != weapons->end(); ++weapon) { + ObjArray *weapons = player->getWeapons(true); + for (ObjArray::const_iterator weapon = weapons->begin(); weapon != weapons->end(); ++weapon) { if (tryAttack(*weapon, input)) { handleAttack(*weapon); break; @@ -1076,13 +1076,13 @@ void Script::handleOfferCommand(const char *target) { warning("STUB: handleOfferCommand"); } -bool Script::tryAttack(Weapon *weapon, Common::String &input) { +bool Script::tryAttack(Obj *weapon, Common::String &input) { warning("STUB: tryAttack"); return false; } -void Script::handleAttack(Weapon *weapon) { +void Script::handleAttack(Obj *weapon) { warning("STUB: handleAttack"); } |