diff options
| author | Max Horn | 2002-12-25 14:46:39 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 14:46:39 +0000 |
| commit | 004ea9f8eb7aa3cd79540c72b75986a9fa182cf6 (patch) | |
| tree | 136ede26c4d6b73c99b3b102b18d548b1aae9ab3 /scumm/script_v5.cpp | |
| parent | a01b169434b87aacb67fd1939545f3b3120ae235 (diff) | |
| download | scummvm-rg350-004ea9f8eb7aa3cd79540c72b75986a9fa182cf6.tar.gz scummvm-rg350-004ea9f8eb7aa3cd79540c72b75986a9fa182cf6.tar.bz2 scummvm-rg350-004ea9f8eb7aa3cd79540c72b75986a9fa182cf6.zip | |
converted heaps of int16 to int for V8 compatibility; fixed defineArray for V8; added some work in o8_kludge2
svn-id: r6132
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 97b7fc9ac4..0b82f0dd85 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -466,7 +466,7 @@ void Scumm_v5::o5_actorSet() case 15: /* unk */ error("o5_actorset:unk not implemented"); #if 0 - int16 args[16] = + int args[16] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, @@ -583,7 +583,7 @@ void Scumm_v5::o5_breakHere() void Scumm_v5::o5_chainScript() { - int16 vars[16]; + int vars[16]; int data; int cur; @@ -603,7 +603,7 @@ void Scumm_v5::o5_chainScript() void Scumm_v5::o5_cursorCommand() { int i, j, k; - int16 table[16]; + int table[16]; switch ((_opcode = fetchScriptByte()) & 0x1F) { case 1: /* cursor show */ _cursor.state = 1; @@ -665,7 +665,7 @@ void Scumm_v5::o5_cursorCommand() void Scumm_v5::o5_cutscene() { - int16 args[16]; + int args[16]; getWordVararg(args); cutscene(args); } @@ -2030,7 +2030,7 @@ void Scumm_v5::o5_setVarRange() void Scumm_v5::o5_soundKludge() { - int16 items[15]; + int items[15]; int i; if (_features & GF_SMALL_HEADER) { // Is WaitForSentence in SCUMM V3 @@ -2048,9 +2048,9 @@ void Scumm_v5::o5_soundKludge() for (i = 0; i < 15; i++) items[i] = 0; - getWordVararg(items); + int num = getWordVararg(items); - _sound->soundKludge(items); + _sound->soundKludge(items, num); } void Scumm_v5::o5_startMusic() @@ -2061,7 +2061,7 @@ void Scumm_v5::o5_startMusic() void Scumm_v5::o5_startObject() { int obj, script; - int16 data[16]; + int data[16]; obj = getVarOrDirectWord(0x80); script = getVarOrDirectByte(0x40); @@ -2073,7 +2073,7 @@ void Scumm_v5::o5_startObject() void Scumm_v5::o5_startScript() { int op, script; - int16 data[16]; + int data[16]; int a, b; op = _opcode; @@ -2449,7 +2449,7 @@ void Scumm_v5::o5_walkActorToObject() } } -int Scumm_v5::getWordVararg(int16 *ptr) +int Scumm_v5::getWordVararg(int *ptr) { int i; |