diff options
| -rw-r--r-- | scumm/akos.cpp | 15 | ||||
| -rw-r--r-- | scumm/dialogs.cpp | 21 |
2 files changed, 35 insertions, 1 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index dc4b421fb0..302411532a 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -524,6 +524,9 @@ void AkosRenderer::codec1_spec3() { } while (1); } +#ifdef __PALM_OS__ +const byte *default_scale_table; +#else const byte default_scale_table[768] = { 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, @@ -624,6 +627,7 @@ const byte default_scale_table[768] = { 0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF, }; +#endif void AkosRenderer::codec1() { int num_colors; @@ -1378,6 +1382,7 @@ bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int case AKC_SkipG: case AKC_SkipLE: case AKC_SkipL: + case AKC_SkipNE: case AKC_SkipE: curpos += 5; @@ -1650,3 +1655,13 @@ bool Scumm::akos_compare(int a, int b, byte cmd) { return a >= b; } } + +#ifdef __PALM_OS__ +#include "scumm_globals.h" // init globals +void Akos_initGlobals() { + GSETPTR(default_scale_table, GBVARS_DEFAULTSCALETABLE_INDEX, byte, GBVARS_SCUMM) +} +void Akos_releaseGlobals() { + GRELEASEPTR(GBVARS_DEFAULTSCALETABLE_INDEX, GBVARS_SCUMM) +} +#endif diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index 7690017a5c..f27505ff5e 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -81,6 +81,11 @@ static const char* string_map_table_custom[] = { "Please select an action" //27 }; +#ifdef __PALM_OS__ +static ResString *string_map_table_v7; +static ResString *string_map_table_v6; +static ResString *string_map_table_v5; +#else static ResString string_map_table_v7[] = { {96, "game name and version"}, //that's how it's supposed to be {77, "Select a game to LOAD"}, @@ -153,7 +158,7 @@ static ResString string_map_table_v5[] = { {12, "Ok"}, {4, "Game paused"} }; - +#endif #pragma mark - @@ -758,3 +763,17 @@ void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { } #endif + +#ifdef __PALM_OS__ +#include "scumm_globals.h" // init globals +void Dialogs_initGlobals() { + GSETPTR(string_map_table_v7, GBVARS_STRINGMAPTABLEV7_INDEX, ResString, GBVARS_SCUMM) + GSETPTR(string_map_table_v6, GBVARS_STRINGMAPTABLEV6_INDEX, ResString, GBVARS_SCUMM) + GSETPTR(string_map_table_v5, GBVARS_STRINGMAPTABLEV5_INDEX, ResString, GBVARS_SCUMM) +} +void Dialogs_releaseGlobals() { + GRELEASEPTR(GBVARS_STRINGMAPTABLEV7_INDEX, GBVARS_SCUMM) + GRELEASEPTR(GBVARS_STRINGMAPTABLEV6_INDEX, GBVARS_SCUMM) + GRELEASEPTR(GBVARS_STRINGMAPTABLEV5_INDEX, GBVARS_SCUMM) +} +#endif |