diff options
| author | Vladimir Menshakov | 2010-01-06 09:38:56 +0000 |
|---|---|---|
| committer | Vladimir Menshakov | 2010-01-06 09:38:56 +0000 |
| commit | 427a15cd05e248e6da93eb56426420df9caabfef (patch) | |
| tree | 2639b1a932691bdd0d12ea78e5343934eec10e0f /engines/teenagent | |
| parent | 789f2ce25501757a91b0c6d426a73e4108e5e4b1 (diff) | |
| download | scummvm-rg350-427a15cd05e248e6da93eb56426420df9caabfef.tar.gz scummvm-rg350-427a15cd05e248e6da93eb56426420df9caabfef.tar.bz2 scummvm-rg350-427a15cd05e248e6da93eb56426420df9caabfef.zip | |
minor cleanups
svn-id: r47068
Diffstat (limited to 'engines/teenagent')
| -rw-r--r-- | engines/teenagent/teenagent.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index 77a3708dec..4fac7e06d2 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -70,9 +70,9 @@ bool TeenAgentEngine::trySelectedObject() { spot.dump(); if (spot.actor_x != 0xffff && spot.actor_y != 0xffff) moveTo(spot.actor_x, spot.actor_y, spot.orientation); - inventory->resetSelectedObject(); if (!processCallback(TO_LE_16(spot.callback))) debug(0, "fixme! display proper description"); + inventory->resetSelectedObject(); return true; } } @@ -97,11 +97,8 @@ void TeenAgentEngine::processObject() { dcall = res->dseg.ptr(READ_LE_UINT16(dcall + scene->getId() * 2 - 2)); dcall += 2 * dst_object->id - 2; uint16 callback = READ_LE_UINT16(dcall); - if (callback == 0 || !processCallback(callback)) { - Common::String desc = dst_object->description; - displayMessage(desc); - //debug(0, "%s[%u]: description: %s", current_object->name, current_object->id, desc.c_str()); - } + if (callback == 0 || !processCallback(callback)) + displayMessage(dst_object->description); } break; case kActionUse: { @@ -113,7 +110,7 @@ void TeenAgentEngine::processObject() { dcall += 2 * dst_object->id - 2; uint16 callback = READ_LE_UINT16(dcall); if (!processCallback(callback)) - scene->displayMessage(dst_object->description); + displayMessage(dst_object->description); } break; |