aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2008-12-04 00:31:01 +0000
committerSven Hesse2008-12-04 00:31:01 +0000
commit0e954c85b3d8e17648723b76050c33b6fe22afd8 (patch)
treed6a541416126a4aa506f7d38d7c557eb671d66a6
parentabae99d6451e89c62f7037cc3372876d036af781 (diff)
downloadscummvm-rg350-0e954c85b3d8e17648723b76050c33b6fe22afd8.tar.gz
scummvm-rg350-0e954c85b3d8e17648723b76050c33b6fe22afd8.tar.bz2
scummvm-rg350-0e954c85b3d8e17648723b76050c33b6fe22afd8.zip
A few more GobOpcodes that jump to the space shooter + fudging the result to something not resulting in a non-quitable state
svn-id: r35230
-rw-r--r--engines/gob/inter_v5.cpp60
1 files changed, 6 insertions, 54 deletions
diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp
index 6df76bda4a..acead4ac55 100644
--- a/engines/gob/inter_v5.cpp
+++ b/engines/gob/inter_v5.cpp
@@ -40,6 +40,9 @@ namespace Gob {
const int Inter_v5::_goblinFuncLookUp[][2] = {
{0, 0},
{1, 0},
+ {3, 0},
+ {2, 0},
+ {33, 0},
{80, 1},
{81, 2},
{82, 3},
@@ -61,54 +64,7 @@ const int Inter_v5::_goblinFuncLookUp[][2] = {
{98, 12},
{99, 0},
{100, 13},
- {200, 14},
- {30, 24},
- {32, 25},
- {33, 26},
- {34, 27},
- {35, 28},
- {36, 29},
- {37, 30},
- {40, 31},
- {41, 32},
- {42, 33},
- {43, 34},
- {44, 35},
- {50, 36},
- {52, 37},
- {53, 38},
- {100, 39},
- {152, 40},
- {200, 41},
- {201, 42},
- {202, 43},
- {203, 44},
- {204, 45},
- {250, 46},
- {251, 47},
- {252, 48},
- {500, 49},
- {502, 50},
- {503, 51},
- {600, 52},
- {601, 53},
- {602, 54},
- {603, 55},
- {604, 56},
- {605, 57},
- {1000, 58},
- {1001, 59},
- {1002, 60},
- {1003, 61},
- {1004, 62},
- {1005, 63},
- {1006, 64},
- {1008, 65},
- {1009, 66},
- {1010, 67},
- {1011, 68},
- {1015, 69},
- {2005, 70}
+ {200, 14}
};
Inter_v5::Inter_v5(GobEngine *vm) : Inter_v4(vm) {
@@ -768,16 +724,12 @@ void Inter_v5::o5_spaceShooter(OpGobParams &params) {
uint32 var1 = load16() * 4;
uint32 var2 = load16() * 4;
-#if 1
+
load16();
load16();
-#else
- uint32 var3 = load16() * 4;
- uint16 var4 = load16();
-#endif
if (params.extraData != 0) {
- WRITE_VARO_UINT32(var1, 0);
+ WRITE_VARO_UINT32(var1, 2);
WRITE_VARO_UINT32(var2, 0);
} else {
if (paramCount < 5) {