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

- Moved palette initialization inside the graphics resource manager

Browse source 
- The static palette is no longer needlessly referenced directly outside the graphics resource manager
- Moved the SCI interpreter version inside the graphics resource manager, instead of gfx_state_t

svn-id: r39626
This commit is contained in:
Filippos Karapetis 2009-03-23 08:43:53 +00:00
parent 93ff05cb6d
commit a6f49a636b
6 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/sci/engine/kgraphics.cpp
View file

@ -266,10 +266,10 @@ PaletteEntry get_pic_color(EngineState *s, int color) {
if (color == 255)
return PaletteEntry(255,255,255);
else if (color < s->gfx_state->gfxResMan->getNumberOfColors())
return s->gfx_state->gfxResMan->getStaticPalette()->getColor(color);
else if (color < s->gfx_state->gfxResMan->getColorCount())
return s->gfx_state->gfxResMan->getColor(color);
else {
SCIkwarn(SCIkERROR, "Color index %d out of bounds for pic %d (%d max)", color, s->gfx_state->pic_nr, s->gfx_state->gfxResMan->getNumberOfColors());
SCIkwarn(SCIkERROR, "Color index %d out of bounds for pic %d (%d max)", color, s->gfx_state->pic_nr, s->gfx_state->gfxResMan->getColorCount());
BREAKPOINT();
return PaletteEntry(0,0,0);
}
@ -1262,10 +1262,10 @@ reg_t kPalette(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int i, delta, bestindex = -1, bestdelta = 200000;
for (i = 0; i < s->gfx_state->gfxResMan->getNumberOfColors(); i++) {
int dr = abs(s->gfx_state->gfxResMan->getStaticPalette()->getColor(i).r - r);
int dg = abs(s->gfx_state->gfxResMan->getStaticPalette()->getColor(i).g - g);
int db = abs(s->gfx_state->gfxResMan->getStaticPalette()->getColor(i).b - b);
for (i = 0; i < s->gfx_state->gfxResMan->getColorCount(); i++) {
int dr = abs(s->gfx_state->gfxResMan->getColor(i).r - r);
int dg = abs(s->gfx_state->gfxResMan->getColor(i).g - g);
int db = abs(s->gfx_state->gfxResMan->getColor(i).b - b);
delta = dr * dr + dg * dg + db * db;