diff options
| author | Willem Jan Palenstijn | 2009-10-15 09:54:45 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-10-15 09:54:45 +0000 |
| commit | c3e1f7be6b2810f95a5fa14df716292db71a30c2 (patch) | |
| tree | a789989ccb452066b963fc3695bddd464075e09e /engines | |
| parent | 03d2c959319bb2a17b8526a690d59dda8a39a856 (diff) | |
| download | scummvm-rg350-c3e1f7be6b2810f95a5fa14df716292db71a30c2.tar.gz scummvm-rg350-c3e1f7be6b2810f95a5fa14df716292db71a30c2.tar.bz2 scummvm-rg350-c3e1f7be6b2810f95a5fa14df716292db71a30c2.zip | |
SCI: Don't cache squares
svn-id: r45109
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/gui/gui_palette.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/gui/gui_palette.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/engines/sci/gui/gui_palette.cpp b/engines/sci/gui/gui_palette.cpp index f413f66766..7dd6a4d9d0 100644 --- a/engines/sci/gui/gui_palette.cpp +++ b/engines/sci/gui/gui_palette.cpp @@ -64,10 +64,6 @@ SciGuiPalette::SciGuiPalette(ResourceManager *resMan, SciGuiScreen *screen, bool } }; } - - // Init _clrPowers used in MatchColor - for(color = 0; color < 256; color++) - _clrPowers[color] = color*color; } SciGuiPalette::~SciGuiPalette() { @@ -251,7 +247,7 @@ uint16 SciGuiPalette::matchColor(GuiPalette *pPal, byte r, byte g, byte b) { dg = pPal->colors[i].g - g; db = pPal->colors[i].b - b; // minimum squares match - cdiff = _clrPowers[ABS(dr)] + _clrPowers[ABS(dg)] + _clrPowers[ABS(db)]; + cdiff = (dr*dr) + (dg*dg) + (db*db); // minimum sum match (Sierra's) // cdiff = ABS(dr) + ABS(dg) + ABS(db); if (cdiff < diff) { diff --git a/engines/sci/gui/gui_palette.h b/engines/sci/gui/gui_palette.h index fa050c03bf..1bfc3aa3e4 100644 --- a/engines/sci/gui/gui_palette.h +++ b/engines/sci/gui/gui_palette.h @@ -56,8 +56,6 @@ private: SciGuiScreen *_screen; ResourceManager *_resMan; - uint16 _clrPowers[256]; - Common::Array<GuiPalSchedule> _schedules; }; |