From 9d2578eee913090486c1e86225d9f175620ca8c5 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Thu, 21 Apr 2005 16:07:31 +0000 Subject: Sync. HE100. svn-id: r17738 --- scumm/script_v100he.cpp | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'scumm/script_v100he.cpp') diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 2cd8136c85..6910e1b905 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -2388,15 +2388,16 @@ void ScummEngine_v100he::o100_getWizData() { } void ScummEngine_v100he::o100_getPaletteData() { + int b, c, d, e; int palSlot, color; byte subOp = fetchScriptByte(); switch (subOp) { case 13: - pop(); - pop(); - push(0); + c = pop(); + b = pop(); + push(getPaletteUnk2(1, b, c)); break; case 20: color = pop(); @@ -2404,25 +2405,29 @@ void ScummEngine_v100he::o100_getPaletteData() { push(getHEPaletteColor(palSlot, color)); break; case 33: + e = pop(); + d = pop(); + palSlot = pop(); pop(); - pop(); - pop(); - pop(); - pop(); - pop(); - push(0); + c = pop(); + b = pop(); + push(getPaletteUnk1(palSlot, b, c, d, e)); break; case 53: pop(); - pop(); - pop(); - push(0); + c = pop(); + c = MAX(0, c); + c = MIN(c, 255); + b = pop(); + b = MAX(0, b); + b = MIN(b, 255); + push(getPaletteUnk1(1, b, c, 10, 245)); break; case 73: - pop(); - pop(); - pop(); - push(0); + c = pop(); + b = pop(); + palSlot = pop(); + push(getPaletteUnk2(palSlot, b, c)); break; default: error("o100_getPaletteData: Unknown case %d", subOp); -- cgit v1.2.3