diff options
| author | Eugene Sandulenko | 2016-01-17 23:11:19 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-02-14 17:12:46 +0100 |
| commit | 8e30167e854a12cf545e7ad56a33e20122fe58c0 (patch) | |
| tree | a4d5b33dd7b1bf809d9b8a7e78956c1c1f9d7542 /engines/wage/combat.cpp | |
| parent | 87698593db098cd906a5b8f7f19eb7f6db5a6e7a (diff) | |
| download | scummvm-rg350-8e30167e854a12cf545e7ad56a33e20122fe58c0.tar.gz scummvm-rg350-8e30167e854a12cf545e7ad56a33e20122fe58c0.tar.bz2 scummvm-rg350-8e30167e854a12cf545e7ad56a33e20122fe58c0.zip | |
WAGE: Implement handleAcceptCommand()
Diffstat (limited to 'engines/wage/combat.cpp')
| -rw-r--r-- | engines/wage/combat.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp index cdf336f9f4..2d1e02a955 100644 --- a/engines/wage/combat.cpp +++ b/engines/wage/combat.cpp @@ -53,9 +53,13 @@ namespace Wage { Obj *WageEngine::getOffer() { - warning("STUB: WageEngine::getOffer"); - - return NULL; + if (_offer != NULL) { + Chr *owner = _offer->_currentOwner; + if (owner == NULL || owner->_playerCharacter || owner->_currentScene != _world->_player->_currentScene) { + _offer = NULL; + } + } + return _offer; } Chr *WageEngine::getMonster() { |