libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-17 07:07:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some changes for v1 costumes

Browse Source 
svn-id: r8380
This commit is contained in:
Paweł Kołodziejski 2003-06-07 10:44:54 +00:00
parent f1b3e170e9
commit 395ab54ea9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scumm/costume.cpp
View File

@ -436,7 +436,9 @@ void LoadedCostume::loadCostume(int id) {
// Don't forget, these games were designed around a fixed 16 color HW palette :-) // Don't forget, these games were designed around a fixed 16 color HW palette :-)
// In addition, all offsets are shifted by 2; we accomodate that via a seperate // In addition, all offsets are shifted by 2; we accomodate that via a seperate
// _baseptr value (instead of adding tons of if's throughout the code). // _baseptr value (instead of adding tons of if's throughout the code).
if (_vm->_features & GF_OLD_BUNDLE) { if (_vm->_version == 1)
_baseptr += 2;
else if (_vm->_features & GF_OLD_BUNDLE) {
_numColors = 1; _numColors = 1;
_baseptr += 2; _baseptr += 2;
} }
@ -510,7 +512,10 @@ void Scumm::cost_decodeData(Actor *a, int frame, uint usemask) {
return; return;
} }
r = lc._baseptr + READ_LE_UINT16(lc._ptr + anim * 2 + lc._numColors + 42); if (_version == 1)
r = lc._baseptr + READ_LE_UINT16(lc._ptr + anim * 2 + lc._numColors + 30);
else
r = lc._baseptr + READ_LE_UINT16(lc._ptr + anim * 2 + lc._numColors + 42);
if (r == lc._baseptr) { if (r == lc._baseptr) {
return; return;
@ -573,6 +578,8 @@ void CostumeRenderer::setPalette(byte *palette) {
memset(_palette, 8, 16); memset(_palette, 8, 16);
_palette[12] = 0; _palette[12] = 0;
} }
if (_vm->_version == 1)
return;
_palette[_loaded._ptr[8]] = _palette[0]; _palette[_loaded._ptr[8]] = _palette[0];
} else { } else {
if ((_vm->_features & GF_NEW_OPCODES) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) { if ((_vm->_features & GF_NEW_OPCODES) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {