diff options
| author | Vincent Hamm | 2007-12-20 19:02:16 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2007-12-20 19:02:16 +0000 |
| commit | b9aaa43bfba4f37705c03b053536bd7cf064a795 (patch) | |
| tree | 7cd48c7a9d243374ad1ac57d68623cabc937034b /engines/cruise/function.cpp | |
| parent | 335e9da41dfe5f019c83478f8ffe95b0a8807dd4 (diff) | |
| download | scummvm-rg350-b9aaa43bfba4f37705c03b053536bd7cf064a795.tar.gz scummvm-rg350-b9aaa43bfba4f37705c03b053536bd7cf064a795.tar.bz2 scummvm-rg350-b9aaa43bfba4f37705c03b053536bd7cf064a795.zip | |
Fix palette manipulation code
Add one missing opcode
svn-id: r29928
Diffstat (limited to 'engines/cruise/function.cpp')
| -rw-r--r-- | engines/cruise/function.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 25899a56ed..38d5c966b2 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -571,12 +571,24 @@ int16 Op_WriteObject(void) { int16 param3 = popVar(); int16 param4 = popVar(); -getSingleObjectParam(param4, param3, param2, &returnParam); + getSingleObjectParam(param4, param3, param2, &returnParam); setObjectPosition(param4, param3, param2, param1); return returnParam; } +int16 Op_ReadObject(void) { + int16 returnParam; + + int member = popVar(); + int obj = popVar(); + int ovl = popVar(); + + getSingleObjectParam(ovl, obj, member, &returnParam); + + return returnParam; +} + int16 Op_FadeIn(void) { doFade = 1; return 0; @@ -1614,7 +1626,7 @@ opcodeFunction opcodeTablePtr[] = Op_FindObject, Op_FindProc, Op_WriteObject, - NULL, // Op_ReadObject + Op_ReadObject, Op_RemoveOverlay, Op_AddBackgroundIncrust, |