thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add separate function for loading palette from choosen room.

Browse source 
Avoid pointer problems.

svn-id: r17653
This commit is contained in:
Travis Howell 2005-04-17 12:55:42 +00:00
parent 2141a2648c
commit caae2f00de
8 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scumm/palette.cpp
View file

@ -857,14 +857,24 @@ void ScummEngine::setPalColor(int idx, int r, int g, int b) {
setDirtyColors(idx, idx);
}
void ScummEngine::setPalette(int palindex, int room) {
void ScummEngine::setPalette(int palindex) {
const byte *pals;
_curPalIndex = palindex;
pals = getPalettePtr(_curPalIndex, room);
pals = getPalettePtr(_curPalIndex, _roomResource);
setPaletteFromPtr(pals);
}
void ScummEngine::setRoomPalette(int palindex, int room) {
const byte *roomptr = getResourceAddress(rtRoom, room);
assert(roomptr);
const byte *pals = findResource(MKID('PALS'), roomptr);
assert(pals);
const byte *rgbs = findPalInPals(pals, palindex);
assert(rgbs);
setPaletteFromPtr(rgbs);
}
const byte *ScummEngine::findPalInPals(const byte *pal, int idx) {
const byte *offs;
uint32 size;