libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 13:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
svn-id: r6197
This commit is contained in:
Max Horn 2002-12-27 14:04:25 +00:00
parent b487206a22
commit 81c421ec0c
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scumm/akos.cpp
View File

@ -595,11 +595,11 @@ void AkosRenderer::codec1()
/* implement custom scale table */
v1.scaletable = default_scale_table;
// FIXME - which value for VAR_CUSTOMSCALETABLE in V8 ?
if (_vm->isGlobInMemory(rtString, _vm->_vars[_vm->VAR_CUSTOMSCALETABLE])) {
v1.scaletable = _vm->getStringAddressVar(_vm->VAR_CUSTOMSCALETABLE);
} else {
v1.scaletable = default_scale_table;
}
/* Setup color decoding variables */
@ -1239,10 +1239,10 @@ void AkosRenderer::codec16() {
if (!mirror) {
dir = -1;
int tmp_skip_x = skip_x;
skip_x = _width-1-cur_x;
cur_x = _width-1-tmp_skip_x;
width_unk = clip_right;
int tmp_skip_x = skip_x;
skip_x = _width - 1 - cur_x;
cur_x = _width - 1 - tmp_skip_x;
width_unk = clip_right;
/*
tmp1 = width - 1;
tmp2 = cur_x;
@ -1252,7 +1252,8 @@ void AkosRenderer::codec16() {
tmp1 -= cur_x;
width_unk = clip_right;
skip_x = tmp3;
cur_x = tmp1;*/
cur_x = tmp1;
*/
} else {
dir = 1;
width_unk = clip_left;
@ -1415,8 +1416,7 @@ bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int
switch (code) {
case AKC_StartAnimInActor:
akos_queCommand(4, derefActorSafe(a->getAnimVar(GB(2)),
"akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0);
akos_queCommand(4, derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0);
continue;
case AKC_Random:
@ -1460,8 +1460,7 @@ bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int
akos_queCommand(4, a, a->getAnimVar(GB(2)), 0);
continue;
case AKC_SetVarInActor:
derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4)
);
derefActorSafe(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4));
continue;
case AKC_HideActor:
akos_queCommand(1, a, 0, 0);

6
scumm/akos.h
View File

@ -29,11 +29,11 @@
struct CostumeData;
struct AkosHeader {
byte x_1[2];
byte unk_1[2];
byte flags;
byte x_2;
byte unk_2;
uint16 num_anims;
uint16 x_3;
uint16 unk_3;
uint16 codec;
} GCC_PACK;

6
scumm/gfx.cpp
View File

@ -2680,9 +2680,9 @@ void Scumm::setupShadowPalette(int slot, int redScale, int greenScale, int blueS
curpal = _currentPalette + startColor * 3;
for (i = startColor; i <= endColor; i++) {
*table++ = remapPaletteColor((curpal[0] * redScale) >> 8,
curpal[1] * greenScale >> 8,
curpal[2] * blueScale >> 8,
(uint) - 1);
(curpal[1] * greenScale) >> 8,
(curpal[2] * blueScale) >> 8,
(uint) - 1);
curpal += 3;
}
}

2
scumm/script.cpp
View File

@ -488,7 +488,7 @@ void Scumm::push(int a)
int Scumm::pop()
{
if ((_scummStackPos < 1) || ((unsigned int)_scummStackPos > ARRAYSIZE(_scummStack))) {
error("No items on stack to pop() for %s (0x%X) at [%d-%d]\n", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
error("No items on stack to pop() for %s (0x%X) at [%d-%d]", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
}
return _scummStack[--_scummStackPos];