aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2016-08-22 18:52:20 +0300
committerFilippos Karapetis2016-08-22 18:52:20 +0300
commit6b5e87683c4203ac180dffce384791da55d6adb0 (patch)
treea5f1dedc540216742298ff0123dcc738f6601408
parentb620b92ee75909e11ecce6c7cd60e121d57360c1 (diff)
downloadscummvm-rg350-6b5e87683c4203ac180dffce384791da55d6adb0.tar.gz
scummvm-rg350-6b5e87683c4203ac180dffce384791da55d6adb0.tar.bz2
scummvm-rg350-6b5e87683c4203ac180dffce384791da55d6adb0.zip
SCI32: Reorder the SCI32 palette kernel call assignments
-rw-r--r--engines/sci/engine/kernel_tables.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 68611b0dee..acd1adf6ec 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -294,16 +294,16 @@ static const SciKernelMapSubEntry kPalette_subops[] = {
{ SIG_SCI16, 1, MAP_CALL(PaletteSetFromResource), "i(i)", NULL },
{ SIG_SCI16, 2, MAP_CALL(PaletteSetFlag), "iii", NULL },
{ SIG_SCI16, 3, MAP_CALL(PaletteUnsetFlag), "iii", kPaletteUnsetFlag_workarounds },
-#ifdef ENABLE_SCI32
- { SIG_SCI32, 1, MAP_CALL(PaletteSetFromResource32), "i(i)", NULL },
- { SIG_SCI32, 2, MAP_CALL(PaletteSetFade), "iii", NULL },
- { SIG_SCI32, 3, MAP_CALL(PaletteFindColor32), "iii", NULL },
-#endif
{ SIG_SCI16, 4, MAP_CALL(PaletteSetIntensity), "iii(i)", NULL },
{ SIG_SCI16, 5, MAP_CALL(PaletteFindColor), "iii", NULL },
{ SIG_SCI16, 6, MAP_CALL(PaletteAnimate), "i*", NULL },
{ SIG_SCI16, 7, MAP_CALL(PaletteSave), "", NULL },
{ SIG_SCI16, 8, MAP_CALL(PaletteRestore), "[r0]", NULL },
+#ifdef ENABLE_SCI32
+ { SIG_SCI32, 1, MAP_CALL(PaletteSetFromResource32), "i(i)", NULL },
+ { SIG_SCI32, 2, MAP_CALL(PaletteSetFade), "iii", NULL },
+ { SIG_SCI32, 3, MAP_CALL(PaletteFindColor32), "iii", NULL },
+#endif
SCI_SUBOPENTRY_TERMINATOR
};