diff options
Diffstat (limited to 'engines/igor/parts')
| -rw-r--r-- | engines/igor/parts/part_90.cpp | 5 | ||||
| -rw-r--r-- | engines/igor/parts/part_main.cpp | 18 |
2 files changed, 11 insertions, 12 deletions
diff --git a/engines/igor/parts/part_90.cpp b/engines/igor/parts/part_90.cpp index c069d5d34e..c503d155f2 100644 --- a/engines/igor/parts/part_90.cpp +++ b/engines/igor/parts/part_90.cpp @@ -69,10 +69,9 @@ void IgorEngine::PART_90() { _inputVars[kInputEscape] = 0; fadeOutPalette(768); if (_currentPart != kInvalidPart) { - if (_currentPart == 904) { + ++_currentPart; + if ((_gameVersion == kIdSpaCD && _currentPart == 904) || _currentPart == 905) { _currentPart = 850; - } else { - ++_currentPart; } } } diff --git a/engines/igor/parts/part_main.cpp b/engines/igor/parts/part_main.cpp index 44731b72b8..f3c99b8de1 100644 --- a/engines/igor/parts/part_main.cpp +++ b/engines/igor/parts/part_main.cpp @@ -585,13 +585,13 @@ void IgorEngine::UPDATE_OBJECT_STATE(int num) { if (num == 1 || num == 255) { switch (_objectsState[0]) { case 0: - memcpy(_globalObjectNames + 0x592 / 62, " bottle of whisky", 30); + strcpy(_globalObjectNames[23], " bottle of whisky"); break; case 1: - memcpy(_globalObjectNames + 0x592 / 62, " empty bottle", 30); + strcpy(_globalObjectNames[23], " empty bottle"); break; case 2: - memcpy(_globalObjectNames + 0x592 / 62, " bottle of water", 30); + strcpy(_globalObjectNames[23], " bottle of water"); break; } } @@ -599,21 +599,21 @@ void IgorEngine::UPDATE_OBJECT_STATE(int num) { switch (_objectsState[1]) { case 0: _inventoryImages[23] = 27; - memcpy(_globalObjectNames + 0x5D0 / 62, " lizard", 30); + strcpy(_globalObjectNames[24], " lizard"); break; default: _inventoryImages[23] = 35; - memcpy(_globalObjectNames + 0x5D0 / 62, " fat lizard", 30); + strcpy(_globalObjectNames[24], " fat lizard"); break; } } if (num == 4 || num == 255) { switch (_objectsState[3]) { case 0: - memcpy(_globalObjectNames + 0x554 / 62, " Caroline%s folder", 30); + strcpy(_globalObjectNames[22], " Caroline%s folder"); break; case 1: - memcpy(_globalObjectNames + 0x554 / 62, " Philip%s folder", 30); + strcpy(_globalObjectNames[22], " Philip%s folder"); break; } } @@ -632,10 +632,10 @@ void IgorEngine::UPDATE_OBJECT_STATE(int num) { } if (num == 8 || num == 255) { if (_objectsState[7] == 0) { - memcpy(_globalObjectNames + 0x60E / 62, " statuette", 30); + strcpy(_globalObjectNames[25], " statuette"); _inventoryImages[24] = 29; } else { - memcpy(_globalObjectNames + 0x60E / 62, " reward", 30); + strcpy(_globalObjectNames[25], " reward"); _inventoryImages[24] = 39; } } |