diff options
| author | Ludvig Strigeus | 2001-10-23 19:51:50 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2001-10-23 19:51:50 +0000 |
| commit | 9fdc578af0e2311cb1ff5404fce423bfc7958b1c (patch) | |
| tree | 5d9698ffbd48e56c553a0d6456df5c675612b7ec /costume.cpp | |
| parent | a8fac8f5abb7bfcd47372bec641258f949204cea (diff) | |
| download | scummvm-rg350-9fdc578af0e2311cb1ff5404fce423bfc7958b1c.tar.gz scummvm-rg350-9fdc578af0e2311cb1ff5404fce423bfc7958b1c.tar.bz2 scummvm-rg350-9fdc578af0e2311cb1ff5404fce423bfc7958b1c.zip | |
recompile not needed when switching games
debugger skeleton implemented
svn-id: r3442
Diffstat (limited to 'costume.cpp')
| -rw-r--r-- | costume.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/costume.cpp b/costume.cpp index 6ccde531f0..9aef48ab36 100644 --- a/costume.cpp +++ b/costume.cpp @@ -17,6 +17,10 @@ * * Change Log: * $Log$ + * Revision 1.5 2001/10/23 19:51:50 strigeus + * recompile not needed when switching games + * debugger skeleton implemented + * * Revision 1.4 2001/10/16 20:31:27 strigeus * misc fixes * @@ -112,7 +116,6 @@ byte CostumeRenderer::mainRoutine(Actor *a, int slot, int frame) { _ymove -= (int16)READ_LE_UINT16(_srcptr+10); _srcptr += 12; -#if defined(DOTT) switch(_ptr[7]&0x7F) { case 0x60: case 0x61: ex1 = _srcptr[0]; @@ -123,7 +126,6 @@ byte CostumeRenderer::mainRoutine(Actor *a, int slot, int frame) { _srcptr = _ptr + READ_LE_UINT16(_ptr + ex1 + ex2*2) + 14; } } -#endif _xpos = _actorX; _ypos = _actorY; @@ -686,12 +688,15 @@ StartPos:; } void CostumeRenderer::loadCostume(int id) { - _ptr = _vm->getResourceAddress(3, id) -#if defined(DOTT) - + 8; -#else - + 2; -#endif + + _ptr = _vm->getResourceAddress(3, id); + + if (_vm->_majorScummVersion == 6) { + _ptr += 8; + } else { + _ptr += 2; + } + switch(_ptr[7]&0x7F) { case 0x58: _numColors = 16; @@ -699,14 +704,12 @@ void CostumeRenderer::loadCostume(int id) { case 0x59: _numColors = 32; break; -#if defined(DOTT) - case 0x60: + case 0x60: /* New since version 6 */ _numColors = 16; break; - case 0x61: + case 0x61: /* New since version 6 */ _numColors = 32; break; -#endif default: error("Costume %d is invalid", id); } |