From 1656f69183fd713af36df2559571c67659d05c38 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sun, 31 May 2009 03:32:16 +0000 Subject: Replacing NULL with 0, since that's normally the C++-way svn-id: r41059 --- engines/gob/detection.cpp | 72 +++--- engines/gob/inter_bargon.cpp | 586 ++++++++++++++++++++--------------------- engines/gob/inter_fascin.cpp | 484 +++++++++++++++++----------------- engines/gob/inter_v1.cpp | 514 ++++++++++++++++++------------------ engines/gob/inter_v2.cpp | 590 +++++++++++++++++++++--------------------- engines/gob/inter_v3.cpp | 592 +++++++++++++++++++++--------------------- engines/gob/inter_v4.cpp | 602 +++++++++++++++++++++---------------------- engines/gob/inter_v5.cpp | 570 ++++++++++++++++++++-------------------- engines/gob/inter_v6.cpp | 600 +++++++++++++++++++++--------------------- 9 files changed, 2305 insertions(+), 2305 deletions(-) diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 1b341e5a5e..5e243d1d92 100644 --- a/engines/gob/detection.cpp +++ b/engines/gob/detection.cpp @@ -404,7 +404,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "f5f028ee39c456fa51fa63b606583918", 313472}, {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformWindows, @@ -421,7 +421,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "e157cb59c6d330ca70d12ab0ef1dd12b", 288972}, {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, DE_DEU, kPlatformWindows, @@ -490,7 +490,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "b45b984ee8017efd6ea965b9becd4d66", 828443}, {"musmac1.mid", 0, "7f96f491448c7a001b32df89cf8d2af2", 1658}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, UNK_LANG, kPlatformMacintosh, @@ -507,7 +507,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "a13ecb4f6d8fd881ebbcc02e45cb5475", 837275}, {"musmac1.mid", 0, "7f96f491448c7a001b32df89cf8d2af2", 1658}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformMacintosh, @@ -771,7 +771,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "285d7340f98ebad65d465585da12910b", 837286}, {"musmac1.mid", 0, "834e55205b710d0af5f14a6f2320dd8e", 8661}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformWindows, @@ -788,7 +788,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "25a99827cd59751a80bed9620fb677a0", 893302}, {"musmac1.mid", 0, "834e55205b710d0af5f14a6f2320dd8e", 8661}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, DE_DEU, kPlatformWindows, @@ -805,7 +805,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "bfd9d02faf3d8d60a2cf744f95eb48dd", 456570}, {"ween.ins", 0, "d2cb24292c9ddafcad07e23382027218", 87800}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_GRB, kPlatformAmiga, @@ -861,7 +861,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "dffd1ab98fe76150d6933329ca6f4cc4", 459458}, {"ween.ins", 0, "d2cb24292c9ddafcad07e23382027218", 87800}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, IT_ITA, kPlatformAmiga, @@ -878,7 +878,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "bfd9d02faf3d8d60a2cf744f95eb48dd", 456570}, {"music__5.snd", 0, "7d1819b9981ecddd53d3aacbc75f1cc8", 13446}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_GRB, kPlatformAtariST, @@ -1168,7 +1168,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "0b72992f5d8b5e6e0330572a5753ea25", 256490}, {"mod.babayaga", 0, "43484cde74e0860785f8e19f0bc776d1", 60248}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, UNK_LANG, kPlatformAmiga, @@ -1263,7 +1263,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "af98bcdc70e1f1c1635577fd726fe7f1", 3937310}, {"musmac1.mid", 0, "ae7229bb09c6abe4e60a2768b24bc890", 9398}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformMacintosh, @@ -1658,7 +1658,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "16b014bf32dbd6ab4c5163c44f56fed1", 445104}, {"musmac1.mid", 0, "948c546cad3a9de5bff3fe4107c82bf1", 6404}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, DE_DEU, kPlatformWindows, @@ -1675,7 +1675,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "32b0f57f5ae79a9ae97e8011df38af42", 157084}, {"musmac1.mid", 0, "834e55205b710d0af5f14a6f2320dd8e", 8661}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_GRB, kPlatformMacintosh, @@ -1939,7 +1939,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "edd7403e5dc2a14459d2665a4c17714d", 209534}, {"musmac1.mid", 0, "948c546cad3a9de5bff3fe4107c82bf1", 6404}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformWindows, @@ -2082,7 +2082,7 @@ static const GOBGameDescription gameDescriptions[] = { {"postc.imd", 0, "24accbcc8b83a9c2be4bd82849a2bd29", 415637}, {"tum.imd", 0, "0993d4810ec9deb3f77c5e92095320fd", 20330}, {"tumi.imd", 0, "bf53f229480d694de0947fe3366fbec6", 248952}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_ANY, kPlatformPC, @@ -2424,7 +2424,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"demo.scn", 0, "16bb85fc5f8e519147b60475dbf33962", 89}, {"wooddem3.vmd", 0, "a1700596172c2d4e264760030c3a3d47", 8994250}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_ANY, kPlatformPC, @@ -2585,7 +2585,7 @@ static const GOBGameDescription gameDescriptions[] = { {"wdemo.s24", 0, "14ac9bd51db7a075d69ddb144904b271", 87}, {"demo.vmd", 0, "65d04715d871c292518b56dd160b0161", 9091237}, {"urband.vmd", 0, "60343891868c91854dd5c82766c70ecc", 922461}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_ANY, kPlatformPC, @@ -2602,7 +2602,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "8c98e9a11be9bb203a55e8c6e68e519b", 25574338}, {"archi.stk", 0, "8d44b2a0d4e3139471213f9f0ed21e81", 5524674}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2619,7 +2619,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "55f0293202963854192e39474e214f5f", 30448474}, {"archi.stk", 0, "8d44b2a0d4e3139471213f9f0ed21e81", 5524674}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2636,7 +2636,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926}, {"archi.stk", 0, "8d44b2a0d4e3139471213f9f0ed21e81", 5524674}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, DE_DEU, kPlatformPC, @@ -2658,7 +2658,7 @@ static const GOBGameDescription gameDescriptions[] = { {"generik.vmd", 0, "b46bdd64b063e86927fb2826500ad512", 603242}, {"genespi.vmd", 0, "b7611916f32a370ae9832962fc17ef72", 758719}, {"spirou.vmd", 0, "8513dbf7ac51c057b21d371d6b217b47", 2550788}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_ANY, kPlatformPC, @@ -2675,7 +2675,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"e.scn", 0, "8a0db733c3f77be86e74e8242e5caa61", 124}, {"demarchg.vmd", 0, "d14a95da7d8792faf5503f649ffcbc12", 5619415}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, EN_ANY, kPlatformPC, @@ -2696,7 +2696,7 @@ static const GOBGameDescription gameDescriptions[] = { {"demo5.vmd", 0, "2abb7b6a26406c984f389f0b24b5e28e", 13290970}, {"demoita.vmd", 0, "b4c0622d14c8749965cd0f5dfca4cf4b", 1183566}, {"wooddem3.vmd", 0, "a1700596172c2d4e264760030c3a3d47", 8994250}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, IT_ITA, kPlatformPC, @@ -2716,7 +2716,7 @@ static const GOBGameDescription gameDescriptions[] = { {"demboues.vmd", 0, "3a0caa10c98ef92a15942f8274075b43", 3535838}, {"demo5.vmd", 0, "2abb7b6a26406c984f389f0b24b5e28e", 13290970}, {"wooddem3.vmd", 0, "a1700596172c2d4e264760030c3a3d47", 8994250}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, ES_ESP, kPlatformPC, @@ -2733,7 +2733,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "55a85036dd93cce93532d8f743d90074", 17467154}, {"spirou.stk", 0, "e3e1b6148dd72fafc3637f1a8e5764f5", 9812043}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2750,7 +2750,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "8c98e9a11be9bb203a55e8c6e68e519b", 25574338}, {"chato.stk", 0, "4fa4ed96a427c344e9f916f9f236598d", 6033793}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2767,7 +2767,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "55f0293202963854192e39474e214f5f", 30448474}, {"chato.stk", 0, "4fa4ed96a427c344e9f916f9f236598d", 6033793}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2784,7 +2784,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926}, {"chato.stk", 0, "3c6cb3ac8a5a7cf681a19971a92a748d", 6033791}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, DE_DEU, kPlatformPC, @@ -2801,7 +2801,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"playtoon.stk", 0, "55f0293202963854192e39474e214f5f", 30448474}, {"wakan.stk", 0, "f493bf82851bc5ba74d57de6b7e88df8", 5520153}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2818,7 +2818,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "2f8db6963ff8d72a8331627ebda918f4", 3613238}, {"bambou.itk", 0, "0875914d31126d0749313428f10c7768", 114440192}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2834,7 +2834,7 @@ static const GOBGameDescription gameDescriptions[] = { "", { {"playtoon.stk", 0, "5f9aae29265f1f105ad8ec195dff81de", 68382024}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -2993,7 +2993,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"intro.stk", 0, "092707829555f27706920e4cacf1fada", 8737958}, {"appbou2.itk", 0, "f7bf045f6bdce5a7607c720e36704f33", 200005632}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, IT_ITA, kPlatformPC, @@ -3010,7 +3010,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"adibou.stk", 0, "977d2449d398f3df23238d718fca35b5", 61097}, {"magic.stk", 0, "9776765dead3e338a32c43bf344b5819", 302664}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -3027,7 +3027,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"adi_exerciser.pak", 0, "585db904fe745ab560886a13500ed5f2", 73207668}, {"adi_texts.pak", 0, "79c73034e0a098d2a45a70ba95f6eace", 10656}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -3044,7 +3044,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"adi_exerciser.pak", 0, "7e4574ea8a8e77585fb17f5c8d7a7831", 65789907}, {"adi_texts.pak", 0, "79c73034e0a098d2a45a70ba95f6eace", 10656}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, @@ -3061,7 +3061,7 @@ static const GOBGameDescription gameDescriptions[] = { { {"adi_exerciser.pak", 0, "a2d7dec00cd5a6e2f2b8bfc225df490e", 136669275}, {"adi_texts.pak", 0, "eb09da3d13770c34bf77e4f94744d5f5", 10616}, - {NULL, 0, NULL, 0} + {0, 0, 0, 0} }, FR_FRA, kPlatformPC, diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp index aa6e1fa7d9..c729bf3c4c 100644 --- a/engines/gob/inter_bargon.cpp +++ b/engines/gob/inter_bargon.cpp @@ -125,22 +125,22 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o2_playMult), OPCODE(o1_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o2_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -159,8 +159,8 @@ void Inter_Bargon::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -169,58 +169,58 @@ void Inter_Bargon::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o2_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ OPCODE(o2_loadMapObjects), OPCODE(o2_freeGoblins), @@ -230,57 +230,57 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o2_stopGoblin), OPCODE(o2_setGoblinState), OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ OPCODE(o2_initScreen), OPCODE(o2_scroll), @@ -293,154 +293,154 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o2_setImdFrontSurf), /* 88 */ OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryBargon opcodesFunc[80] = { @@ -450,7 +450,7 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -458,14 +458,14 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o1_if), OPCODE(o2_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -475,13 +475,13 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o1_capturePop), OPCODE(o2_animPalInit), /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -495,15 +495,15 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -525,7 +525,7 @@ void Inter_Bargon::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -561,81 +561,81 @@ void Inter_Bargon::setupOpcodes() { OPCODE(oBargon_intro8), OPCODE(oBargon_intro9), OPCODE(o_gobNOP), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 14 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 20 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, }; _opcodesDrawBargon = opcodesDraw; @@ -649,7 +649,7 @@ void Inter_Bargon::executeDrawOpcode(byte i) { OpcodeDrawProcBargon op = _opcodesDrawBargon[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -666,7 +666,7 @@ bool Inter_Bargon::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcBargon op = _opcodesFuncBargon[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -678,7 +678,7 @@ void Inter_Bargon::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcBargon op = NULL; + OpcodeGoblinProcBargon op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -686,7 +686,7 @@ void Inter_Bargon::executeGoblinOpcode(int i, OpGobParams ¶ms) { break; } - if (op == NULL) { + if (op == 0) { int16 val; _vm->_global->_inter_execPtr -= 2; diff --git a/engines/gob/inter_fascin.cpp b/engines/gob/inter_fascin.cpp index c325c29713..58c3e703ff 100644 --- a/engines/gob/inter_fascin.cpp +++ b/engines/gob/inter_fascin.cpp @@ -82,10 +82,10 @@ void Inter_Fascination::setupOpcodes() { OPCODE(oFascin_setRenderFlags), OPCODE(oFascin_cdUnknown11), /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -104,8 +104,8 @@ void Inter_Fascination::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -114,278 +114,278 @@ void Inter_Fascination::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o2_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ - {NULL, ""},//OPCODE(o2_loadMapObjects), - {NULL, ""},//OPCODE(o2_freeGoblins), - {NULL, ""},//OPCODE(o2_moveGoblin), - {NULL, ""},//OPCODE(o2_writeGoblinPos), + {0, ""},//OPCODE(o2_loadMapObjects), + {0, ""},//OPCODE(o2_freeGoblins), + {0, ""},//OPCODE(o2_moveGoblin), + {0, ""},//OPCODE(o2_writeGoblinPos), /* 54 */ - {NULL, ""},//OPCODE(o2_stopGoblin), - {NULL, ""},//OPCODE(o2_setGoblinState), - {NULL, ""},//OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""},//OPCODE(o2_stopGoblin), + {0, ""},//OPCODE(o2_setGoblinState), + {0, ""},//OPCODE(o2_placeGoblin), + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ - {NULL, ""},//OPCODE(o2_initScreen), - {NULL, ""},//OPCODE(o2_scroll), - {NULL, ""},//OPCODE(o2_setScrollOffset), - {NULL, ""},//OPCODE(o2_playImd), + {0, ""},//OPCODE(o2_initScreen), + {0, ""},//OPCODE(o2_scroll), + {0, ""},//OPCODE(o2_setScrollOffset), + {0, ""},//OPCODE(o2_playImd), /* 84 */ - {NULL, ""},//OPCODE(o2_getImdInfo), - {NULL, ""},//OPCODE(o2_openItk), - {NULL, ""},//OPCODE(o2_closeItk), - {NULL, ""},//OPCODE(o2_setImdFrontSurf), + {0, ""},//OPCODE(o2_getImdInfo), + {0, ""},//OPCODE(o2_openItk), + {0, ""},//OPCODE(o2_closeItk), + {0, ""},//OPCODE(o2_setImdFrontSurf), /* 88 */ - {NULL, ""},//OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""},//OPCODE(o2_resetImdFrontSurf), + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryFascination opcodesFunc[80] = { @@ -395,7 +395,7 @@ void Inter_Fascination::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -403,14 +403,14 @@ void Inter_Fascination::setupOpcodes() { OPCODE(o1_if), OPCODE(o2_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -422,11 +422,11 @@ void Inter_Fascination::setupOpcodes() { /* 18 */ OPCODE(o2_addCollision), OPCODE(o2_freeCollision), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -440,15 +440,15 @@ void Inter_Fascination::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -470,7 +470,7 @@ void Inter_Fascination::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -524,7 +524,7 @@ void Inter_Fascination::executeDrawOpcode(byte i) { OpcodeDrawProcFascination op = _opcodesDrawFascination[i].proc; - if (op == NULL) + if (op == 0) warning("Not yet implemented Fascination opcodeDraw: %d", i); else (this->*op) (); @@ -698,7 +698,7 @@ bool Inter_Fascination::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) OpcodeFuncProcFascination op = _opcodesFuncFascination[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -710,7 +710,7 @@ void Inter_Fascination::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcFascination op = NULL; + OpcodeGoblinProcFascination op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -718,7 +718,7 @@ void Inter_Fascination::executeGoblinOpcode(int i, OpGobParams ¶ms) { break; } - if (op == NULL) { + if (op == 0) { int16 val; _vm->_global->_inter_execPtr -= 2; diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index a9b4519cca..f238791e2a 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -132,27 +132,27 @@ void Inter_v1::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o1_playMult), OPCODE(o1_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o1_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), OPCODE(o1_updateAnim), - {NULL, ""}, + {0, ""}, /* 14 */ OPCODE(o1_initMult), OPCODE(o1_freeMult), @@ -166,288 +166,288 @@ void Inter_v1::setupOpcodes() { /* 1C */ OPCODE(o1_renderStatic), OPCODE(o1_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o1_playCDTrack), OPCODE(o1_getCDTrackPos), OPCODE(o1_stopCD), - {NULL, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 54 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 84 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 88 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryV1 opcodesFunc[80] = { @@ -457,7 +457,7 @@ void Inter_v1::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -465,14 +465,14 @@ void Inter_v1::setupOpcodes() { OPCODE(o1_if), OPCODE(o1_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -482,13 +482,13 @@ void Inter_v1::setupOpcodes() { OPCODE(o1_capturePop), OPCODE(o1_animPalInit), /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -502,15 +502,15 @@ void Inter_v1::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -532,7 +532,7 @@ void Inter_v1::setupOpcodes() { OPCODE(o1_getFreeMem), OPCODE(o1_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -656,7 +656,7 @@ void Inter_v1::executeDrawOpcode(byte i) { OpcodeDrawProcV1 op = _opcodesDrawV1[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -673,7 +673,7 @@ bool Inter_v1::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcV1 op = _opcodesFuncV1[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -684,7 +684,7 @@ void Inter_v1::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcV1 op = NULL; + OpcodeGoblinProcV1 op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -692,7 +692,7 @@ void Inter_v1::executeGoblinOpcode(int i, OpGobParams ¶ms) { break; } - if (op == NULL) { + if (op == 0) { warning("unimplemented opcodeGoblin: %d", i); _vm->_global->_inter_execPtr -= 2; int16 cmd = load16(); diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 2f501772dc..2c6a9e373c 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -105,22 +105,22 @@ void Inter_v2::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o2_playMult), OPCODE(o2_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o2_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -139,8 +139,8 @@ void Inter_v2::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -149,58 +149,58 @@ void Inter_v2::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o2_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ OPCODE(o2_loadMapObjects), OPCODE(o2_freeGoblins), @@ -210,57 +210,57 @@ void Inter_v2::setupOpcodes() { OPCODE(o2_stopGoblin), OPCODE(o2_setGoblinState), OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ OPCODE(o2_initScreen), OPCODE(o2_scroll), @@ -273,154 +273,154 @@ void Inter_v2::setupOpcodes() { OPCODE(o2_setImdFrontSurf), /* 88 */ OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryV2 opcodesFunc[80] = { @@ -430,7 +430,7 @@ void Inter_v2::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -438,14 +438,14 @@ void Inter_v2::setupOpcodes() { OPCODE(o1_if), OPCODE(o2_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -457,11 +457,11 @@ void Inter_v2::setupOpcodes() { /* 18 */ OPCODE(o2_addCollision), OPCODE(o2_freeCollision), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -475,15 +475,15 @@ void Inter_v2::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -505,7 +505,7 @@ void Inter_v2::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -531,91 +531,91 @@ void Inter_v2::setupOpcodes() { OPCODE(o2_loadInfogramesIns), OPCODE(o2_startInfogrames), OPCODE(o2_stopInfogrames), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 08 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_playInfogrames), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 14 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 20 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o2_handleGoblins), /* 28 */ OPCODE(o2_playProtracker), OPCODE(o2_stopProtracker), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, }; _opcodesDrawV2 = opcodesDraw; @@ -629,7 +629,7 @@ void Inter_v2::executeDrawOpcode(byte i) { OpcodeDrawProcV2 op = _opcodesDrawV2[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -646,7 +646,7 @@ bool Inter_v2::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcV2 op = _opcodesFuncV2[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -658,7 +658,7 @@ void Inter_v2::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcV2 op = NULL; + OpcodeGoblinProcV2 op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -666,7 +666,7 @@ void Inter_v2::executeGoblinOpcode(int i, OpGobParams ¶ms) { break; } - if (op == NULL) { + if (op == 0) { int16 val; _vm->_global->_inter_execPtr -= 2; diff --git a/engines/gob/inter_v3.cpp b/engines/gob/inter_v3.cpp index fee8358ec0..000639e784 100644 --- a/engines/gob/inter_v3.cpp +++ b/engines/gob/inter_v3.cpp @@ -122,22 +122,22 @@ void Inter_v3::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o2_playMult), OPCODE(o2_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o2_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -156,8 +156,8 @@ void Inter_v3::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -166,58 +166,58 @@ void Inter_v3::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o2_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ OPCODE(o2_loadMapObjects), OPCODE(o2_freeGoblins), @@ -227,57 +227,57 @@ void Inter_v3::setupOpcodes() { OPCODE(o2_stopGoblin), OPCODE(o2_setGoblinState), OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ OPCODE(o2_initScreen), OPCODE(o2_scroll), @@ -290,154 +290,154 @@ void Inter_v3::setupOpcodes() { OPCODE(o2_setImdFrontSurf), /* 88 */ OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryV3 opcodesFunc[80] = { @@ -447,7 +447,7 @@ void Inter_v3::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -455,14 +455,14 @@ void Inter_v3::setupOpcodes() { OPCODE(o1_if), OPCODE(o2_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -475,10 +475,10 @@ void Inter_v3::setupOpcodes() { OPCODE(o2_addCollision), OPCODE(o2_freeCollision), OPCODE(o3_getTotTextItemPart), - {NULL, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -492,15 +492,15 @@ void Inter_v3::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -522,7 +522,7 @@ void Inter_v3::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -548,91 +548,91 @@ void Inter_v3::setupOpcodes() { OPCODE(o2_loadInfogramesIns), OPCODE(o2_startInfogrames), OPCODE(o2_stopInfogrames), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 08 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_playInfogrames), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 14 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 20 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o3_wobble), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, }; _opcodesDrawV3 = opcodesDraw; @@ -646,7 +646,7 @@ void Inter_v3::executeDrawOpcode(byte i) { OpcodeDrawProcV3 op = _opcodesDrawV3[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -663,7 +663,7 @@ bool Inter_v3::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcV3 op = _opcodesFuncV3[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -675,7 +675,7 @@ void Inter_v3::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcV3 op = NULL; + OpcodeGoblinProcV3 op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -683,7 +683,7 @@ void Inter_v3::executeGoblinOpcode(int i, OpGobParams ¶ms) { break; } - if (op == NULL) { + if (op == 0) { int16 val; _vm->_global->_inter_execPtr -= 2; diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp index 74721d0e6b..19e813ce1d 100644 --- a/engines/gob/inter_v4.cpp +++ b/engines/gob/inter_v4.cpp @@ -124,22 +124,22 @@ void Inter_v4::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o2_playMult), OPCODE(o2_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o2_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -158,8 +158,8 @@ void Inter_v4::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -168,58 +168,58 @@ void Inter_v4::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o2_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ OPCODE(o2_loadMapObjects), OPCODE(o2_freeGoblins), @@ -229,57 +229,57 @@ void Inter_v4::setupOpcodes() { OPCODE(o2_stopGoblin), OPCODE(o2_setGoblinState), OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ OPCODE(o4_initScreen), OPCODE(o2_scroll), @@ -292,154 +292,154 @@ void Inter_v4::setupOpcodes() { OPCODE(o2_setImdFrontSurf), /* 88 */ OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryV4 opcodesFunc[80] = { @@ -449,7 +449,7 @@ void Inter_v4::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -457,14 +457,14 @@ void Inter_v4::setupOpcodes() { OPCODE(o1_if), OPCODE(o2_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -477,10 +477,10 @@ void Inter_v4::setupOpcodes() { OPCODE(o2_addCollision), OPCODE(o2_freeCollision), OPCODE(o3_getTotTextItemPart), - {NULL, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -494,15 +494,15 @@ void Inter_v4::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -524,7 +524,7 @@ void Inter_v4::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -547,94 +547,94 @@ void Inter_v4::setupOpcodes() { static const OpcodeGoblinEntryV4 opcodesGoblin[71] = { /* 00 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 08 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 14 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 20 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, }; _opcodesDrawV4 = opcodesDraw; @@ -648,7 +648,7 @@ void Inter_v4::executeDrawOpcode(byte i) { OpcodeDrawProcV4 op = _opcodesDrawV4[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -667,7 +667,7 @@ bool Inter_v4::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcV4 op = _opcodesFuncV4[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -679,7 +679,7 @@ void Inter_v4::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcV4 op = NULL; + OpcodeGoblinProcV4 op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -687,7 +687,7 @@ void Inter_v4::executeGoblinOpcode(int i, OpGobParams ¶ms) { break; } - if (op == NULL) { + if (op == 0) { warning("unimplemented opcodeGoblin: %d", i); int16 val; diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp index 46621582e5..488c2052eb 100644 --- a/engines/gob/inter_v5.cpp +++ b/engines/gob/inter_v5.cpp @@ -77,22 +77,22 @@ void Inter_v5::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o2_playMult), OPCODE(o2_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o2_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -111,8 +111,8 @@ void Inter_v5::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -121,58 +121,58 @@ void Inter_v5::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o2_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ OPCODE(o2_loadMapObjects), OPCODE(o2_freeGoblins), @@ -182,57 +182,57 @@ void Inter_v5::setupOpcodes() { OPCODE(o2_stopGoblin), OPCODE(o2_setGoblinState), OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, + {0, ""}, OPCODE(o5_deleteFile), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ OPCODE(o5_initScreen), OPCODE(o2_scroll), @@ -245,154 +245,154 @@ void Inter_v5::setupOpcodes() { OPCODE(o2_setImdFrontSurf), /* 88 */ OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryV5 opcodesFunc[80] = { @@ -402,7 +402,7 @@ void Inter_v5::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o1_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -410,14 +410,14 @@ void Inter_v5::setupOpcodes() { OPCODE(o1_if), OPCODE(o2_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o1_palLoad), @@ -430,10 +430,10 @@ void Inter_v5::setupOpcodes() { OPCODE(o2_addCollision), OPCODE(o2_freeCollision), OPCODE(o3_getTotTextItemPart), - {NULL, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -447,15 +447,15 @@ void Inter_v5::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -477,7 +477,7 @@ void Inter_v5::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -518,76 +518,76 @@ void Inter_v5::setupOpcodes() { OPCODE(o5_gob98), OPCODE(o5_gob100), OPCODE(o5_gob200), - {NULL, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 14 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 20 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, }; _opcodesDrawV5 = opcodesDraw; @@ -601,7 +601,7 @@ void Inter_v5::executeDrawOpcode(byte i) { OpcodeDrawProcV5 op = _opcodesDrawV5[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -620,7 +620,7 @@ bool Inter_v5::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcV5 op = _opcodesFuncV5[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -632,7 +632,7 @@ void Inter_v5::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcV5 op = NULL; + OpcodeGoblinProcV5 op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -642,7 +642,7 @@ void Inter_v5::executeGoblinOpcode(int i, OpGobParams ¶ms) { _vm->_global->_inter_execPtr -= 2; - if (op == NULL) { + if (op == 0) { warning("unimplemented opcodeGoblin: %d", i); int16 paramCount = load16(); diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 19f6a8bbda..04db46c643 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -57,22 +57,22 @@ void Inter_v6::setupOpcodes() { OPCODE(o1_loadMult), OPCODE(o2_playMult), OPCODE(o2_freeMultKeys), - {NULL, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_initCursor), /* 08 */ OPCODE(o1_initCursorAnim), OPCODE(o1_clearCursorAnim), OPCODE(o2_setRenderFlags), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ OPCODE(o1_loadAnim), OPCODE(o1_freeAnim), @@ -91,8 +91,8 @@ void Inter_v6::setupOpcodes() { /* 1C */ OPCODE(o2_renderStatic), OPCODE(o2_loadCurLayer), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 20 */ OPCODE(o2_playCDTrack), OPCODE(o2_waitCDTrackEnd), @@ -101,58 +101,58 @@ void Inter_v6::setupOpcodes() { /* 24 */ OPCODE(o2_freeLIC), OPCODE(o2_getCDTrackPos), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o2_loadFontToSprite), OPCODE(o1_freeFontToSprite), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ OPCODE(o6_totSub), OPCODE(o2_switchTotSub), OPCODE(o2_pushVars), OPCODE(o2_popVars), /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 48 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 4C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 50 */ OPCODE(o2_loadMapObjects), OPCODE(o2_freeGoblins), @@ -162,57 +162,57 @@ void Inter_v6::setupOpcodes() { OPCODE(o2_stopGoblin), OPCODE(o2_setGoblinState), OPCODE(o2_placeGoblin), - {NULL, ""}, + {0, ""}, /* 58 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 5C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 60 */ - {NULL, ""}, + {0, ""}, OPCODE(o5_deleteFile), - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, /* 64 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 68 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 6C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 70 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 74 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 78 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 7C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 80 */ OPCODE(o5_initScreen), OPCODE(o2_scroll), @@ -225,154 +225,154 @@ void Inter_v6::setupOpcodes() { OPCODE(o2_setImdFrontSurf), /* 88 */ OPCODE(o2_resetImdFrontSurf), - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 8C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 90 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 94 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 98 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 9C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* A8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* AC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* B8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* BC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* C8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* CC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* D8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* DC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* E8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* EC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F0 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F4 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* F8 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* FC */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""} + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""} }; static const OpcodeFuncEntryV6 opcodesFunc[80] = { @@ -382,7 +382,7 @@ void Inter_v6::setupOpcodes() { OPCODE(o1_printTotText), OPCODE(o6_loadCursor), /* 04 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_switch), OPCODE(o1_repeatUntil), OPCODE(o1_whileDo), @@ -390,14 +390,14 @@ void Inter_v6::setupOpcodes() { OPCODE(o1_if), OPCODE(o6_evaluateStore), OPCODE(o1_loadSpriteToPos), - {NULL, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, + {0, ""}, OPCODE(o2_printText), OPCODE(o1_loadTot), OPCODE(o6_palLoad), @@ -410,10 +410,10 @@ void Inter_v6::setupOpcodes() { OPCODE(o2_addCollision), OPCODE(o6_freeCollision), OPCODE(o3_getTotTextItemPart), - {NULL, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, OPCODE(o1_drawOperations), OPCODE(o1_setcmdCount), /* 20 */ @@ -427,15 +427,15 @@ void Inter_v6::setupOpcodes() { OPCODE(o1_createSprite), OPCODE(o1_freeSprite), /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ OPCODE(o1_returnTo), OPCODE(o1_loadSpriteContent), @@ -457,7 +457,7 @@ void Inter_v6::setupOpcodes() { OPCODE(o2_getFreeMem), OPCODE(o2_checkData), /* 40 */ - {NULL, ""}, + {0, ""}, OPCODE(o1_prepareStr), OPCODE(o1_insertStr), OPCODE(o1_cutStr), @@ -480,94 +480,94 @@ void Inter_v6::setupOpcodes() { static const OpcodeGoblinEntryV6 opcodesGoblin[71] = { /* 00 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 04 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 08 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 0C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 10 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 14 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 18 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 1C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 20 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 24 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 28 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 2C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 30 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 34 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 38 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 3C */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 40 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, + {0, ""}, /* 44 */ - {NULL, ""}, - {NULL, ""}, - {NULL, ""}, + {0, ""}, + {0, ""}, + {0, ""}, }; _opcodesDrawV6 = opcodesDraw; @@ -581,7 +581,7 @@ void Inter_v6::executeDrawOpcode(byte i) { OpcodeDrawProcV6 op = _opcodesDrawV6[i].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeDraw: %d", i); else (this->*op) (); @@ -602,7 +602,7 @@ bool Inter_v6::executeFuncOpcode(byte i, byte j, OpFuncParams ¶ms) { OpcodeFuncProcV6 op = _opcodesFuncV6[i*16 + j].proc; - if (op == NULL) + if (op == 0) warning("unimplemented opcodeFunc: %d.%d", i, j); else return (this->*op) (params); @@ -614,7 +614,7 @@ void Inter_v6::executeGoblinOpcode(int i, OpGobParams ¶ms) { debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)", i, i, getOpcodeGoblinDesc(i)); - OpcodeGoblinProcV6 op = NULL; + OpcodeGoblinProcV6 op = 0; for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++) if (_goblinFuncLookUp[j][0] == i) { @@ -624,7 +624,7 @@ void Inter_v6::executeGoblinOpcode(int i, OpGobParams ¶ms) { _vm->_global->_inter_execPtr -= 2; - if (op == NULL) { + if (op == 0) { warning("unimplemented opcodeGoblin: %d", i); int16 paramCount = load16(); -- cgit v1.2.3