diff options
| author | Max Horn | 2011-05-13 14:02:53 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-13 14:02:53 +0200 |
| commit | 649f8e0a84804a9d1272ba16b146ea2b9da501fe (patch) | |
| tree | 4e257a06140c69abb043d5c9a2eb3d23e5ff9e1b /engines/scumm/script_v2.cpp | |
| parent | aaf2c0e6ebe373afd06cbf8ebca334710a4ed15d (diff) | |
| download | scummvm-rg350-649f8e0a84804a9d1272ba16b146ea2b9da501fe.tar.gz scummvm-rg350-649f8e0a84804a9d1272ba16b146ea2b9da501fe.tar.bz2 scummvm-rg350-649f8e0a84804a9d1272ba16b146ea2b9da501fe.zip | |
SCUMM: Rename ResTypes->ResType, introduce ResId typedef, change code to use both
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index f7d4e74898..7f02e899b4 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -738,23 +738,23 @@ void ScummEngine_v2::o2_drawObject() { } void ScummEngine_v2::o2_resourceRoutines() { - const ResTypes resTypes[] = { - rtNumTypes, // Invalid - rtNumTypes, // Invalid + const ResType resTypes[] = { + rtInvalid, + rtInvalid, rtCostume, rtRoom, - rtNumTypes, // Invalid + rtInvalid, rtScript, rtSound }; int resid = getVarOrDirectByte(PARAM_1); int opcode = fetchScriptByte(); - ResTypes type = rtNumTypes; + ResType type = rtInvalid; if (0 <= (opcode >> 4) && (opcode >> 4) < (int)ARRAYSIZE(resTypes)) type = resTypes[opcode >> 4]; - if ((opcode & 0x0f) == 0 || type == rtNumTypes) + if ((opcode & 0x0f) == 0 || type == rtInvalid) return; // HACK V2 Maniac Mansion tries to load an invalid sound resource in demo script. |