diff options
| author | Filippos Karapetis | 2010-07-26 07:40:51 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-26 07:40:51 +0000 |
| commit | a278e01998aeda10d22b6edb1e9be23c81abf033 (patch) | |
| tree | 4d104ff9a892055bbbab66272df9fb61195c1195 /engines | |
| parent | efa0f664029151f213c3a73a54bfd48ebf844981 (diff) | |
| download | scummvm-rg350-a278e01998aeda10d22b6edb1e9be23c81abf033.tar.gz scummvm-rg350-a278e01998aeda10d22b6edb1e9be23c81abf033.tar.bz2 scummvm-rg350-a278e01998aeda10d22b6edb1e9be23c81abf033.zip | |
SCI: Fixed bug #3034536 - "AMIGAOS4: SCI - Compiler error".
svn-id: r51302
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/kernel_tables.h | 2 | ||||
| -rw-r--r-- | engines/sci/resource.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index 8d3bfac6a1..943d0cab9d 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -305,7 +305,9 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(AvoidPath), SIG_EVERYWHERE, "ii(.*)", NULL, NULL }, { MAP_CALL(BaseSetter), SIG_EVERYWHERE, "o", NULL, NULL }, { MAP_CALL(CanBeHere), SIG_EVERYWHERE, "o(l)", NULL, NULL }, +#ifdef ENABLE_SCI32 { "CantBeHere", kCantBeHere32, SIG_SCI32, SIGFOR_ALL, "ol", NULL, NULL }, +#endif { MAP_CALL(CantBeHere), SIG_EVERYWHERE, "o(l)", NULL, NULL }, { MAP_CALL(CelHigh), SIG_EVERYWHERE, "ii(i)", NULL, NULL }, { MAP_CALL(CelWide), SIG_EVERYWHERE, "ii(i)", NULL, NULL }, diff --git a/engines/sci/resource.h b/engines/sci/resource.h index f1f5f469d3..f1ea2f15f9 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -149,11 +149,11 @@ public: Common::String toString() const { char buf[32]; - snprintf(buf, 32, "%s.%i", getResourceTypeName(_type), _number); + snprintf(buf, 32, "%s.%d", getResourceTypeName(_type), _number); Common::String retStr = buf; if (_tuple != 0) { - snprintf(buf, 32, "(%i, %i, %i, %i)", _tuple >> 24, (_tuple >> 16) & 0xff, (_tuple >> 8) & 0xff, _tuple & 0xff); + snprintf(buf, 32, "(%d, %d, %d, %d)", _tuple >> 24, (_tuple >> 16) & 0xff, (_tuple >> 8) & 0xff, _tuple & 0xff); retStr += buf; } |