[Scummvm-cvs-logs] SF.net SVN: scummvm: [24472] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Oct 23 13:17:33 CEST 2006
Revision: 24472
http://svn.sourceforge.net/scummvm/?rev=24472&view=rev
Author: kirben
Date: 2006-10-23 04:17:25 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
Re-enable verb code
Modified Paths:
--------------
scummvm/trunk/engines/agos/icons.cpp
scummvm/trunk/engines/agos/verb.cpp
Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp 2006-10-23 11:13:51 UTC (rev 24471)
+++ scummvm/trunk/engines/agos/icons.cpp 2006-10-23 11:17:25 UTC (rev 24472)
@@ -208,7 +208,7 @@
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]);
Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp 2006-10-23 11:13:51 UTC (rev 24471)
+++ scummvm/trunk/engines/agos/verb.cpp 2006-10-23 11:17:25 UTC (rev 24472)
@@ -788,11 +788,11 @@
}
//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)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list