diff options
| author | Vincent Hamm | 2002-03-05 23:05:55 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2002-03-05 23:05:55 +0000 |
| commit | 6600b48be93a44a97f85de7d223c52ffa1225bf2 (patch) | |
| tree | ad757ab0fd7be24f1addbc472fef7aa1cbb5f2b6 /costume.cpp | |
| parent | 720c41a25f8a302985898846f23dff441197c782 (diff) | |
| download | scummvm-rg350-6600b48be93a44a97f85de7d223c52ffa1225bf2.tar.gz scummvm-rg350-6600b48be93a44a97f85de7d223c52ffa1225bf2.tar.bz2 scummvm-rg350-6600b48be93a44a97f85de7d223c52ffa1225bf2.zip | |
More v7 implementation
svn-id: r3656
Diffstat (limited to 'costume.cpp')
| -rw-r--r-- | costume.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/costume.cpp b/costume.cpp index ae88294950..ebd32a499c 100644 --- a/costume.cpp +++ b/costume.cpp @@ -674,7 +674,7 @@ void CostumeRenderer::loadCostume(int id) { if (_vm->_features&GF_AFTER_V6) { _ptr += 8; - } else if(!(_features&GF_SMALL_HEADER)) { + } else if(!(_vm->_features&GF_SMALL_HEADER)) { _ptr += 2; } @@ -711,25 +711,26 @@ void Scumm::initActorCostumeData(Actor *a) { } byte CostumeRenderer::drawOneSlot(Actor *a, int slot) { -#if !defined(FULL_THROTTLE) - int i; - int code; - CostumeData *cd = &a->cost; - - if (cd->curpos[slot]==0xFFFF || cd->stopped & (1<<slot)) - return 0; - i = cd->curpos[slot]&0x7FFF; - _frameptr = _loaded._ptr + READ_LE_UINT16(_loaded._ptr + _loaded._numColors + slot*2 + 10); - code = _loaded._dataptr[i]&0x7F; + if(!(_vm->_features & GF_AFTER_V7)) { + int i; + int code; + CostumeData *cd = &a->cost; + + if (cd->curpos[slot]==0xFFFF || cd->stopped & (1<<slot)) + return 0; + + i = cd->curpos[slot]&0x7FFF; + _frameptr = _loaded._ptr + READ_LE_UINT16(_loaded._ptr + _loaded._numColors + slot*2 + 10); + code = _loaded._dataptr[i]&0x7F; - _srcptr = _loaded._ptr + READ_LE_UINT16(_frameptr + code*2); + _srcptr = _loaded._ptr + READ_LE_UINT16(_frameptr + code*2); - if (code != 0x7B) { - if ( !(_vm->_features & GF_OLD256) || code <0x79) - return mainRoutine(a, slot, code); + if (code != 0x7B) { + if ( !(_vm->_features & GF_OLD256) || code <0x79) + return mainRoutine(a, slot, code); + } } -#endif return 0; |