aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-10-23 11:17:25 +0000
committerTravis Howell2006-10-23 11:17:25 +0000
commitcff9d1ab810adb66633a7593dc48ea07e66b6766 (patch)
tree0811dfe0d35963139b8a7235c850ad44ea82a56e
parent7a5b0c1870ab60f901be689d9b0cc89fde550fb2 (diff)
downloadscummvm-rg350-cff9d1ab810adb66633a7593dc48ea07e66b6766.tar.gz
scummvm-rg350-cff9d1ab810adb66633a7593dc48ea07e66b6766.tar.bz2
scummvm-rg350-cff9d1ab810adb66633a7593dc48ea07e66b6766.zip
Re-enable verb code
svn-id: r24472
-rw-r--r--engines/agos/icons.cpp2
-rw-r--r--engines/agos/verb.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 647459e3b1..d2ae7a078f 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -208,7 +208,7 @@ void AGOSEngine::drawIcon(WindowBlock *window, uint icon, uint x, uint y) {
if (getPlatform() == Common::kPlatformAmiga) {
src = _iconFilePtr;
src += READ_BE_UINT32(&((uint32 *)src)[icon]);
- decompressIconAmiga(dst, src, 24, 20, 16, _dxSurfacePitch);
+ decompressIconAmiga(dst, src, 24, 20, color, _dxSurfacePitch);
} else {
src = _iconFilePtr;
src += READ_LE_UINT16(&((uint16 *)src)[icon]);
diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index d5281b09ba..337a9accc7 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.cpp
@@ -788,11 +788,11 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) {
}
//if (_nameLocked == 0) {
- //if (best_ha->flags & kBFNoTouchName) {
- // clearName();
- //} else if (best_ha != _lastNameOn) {
- // displayName(best_ha);
- //}
+ if (best_ha->flags & kBFNoTouchName) {
+ clearName();
+ } else if (best_ha != _lastNameOn) {
+ displayName(best_ha);
+ }
//}
if (best_ha->flags & kBFInvertTouch && !(best_ha->flags & kBFBoxSelected)) {