diff options
| author | Max Horn | 2011-02-07 17:52:38 +0000 |
|---|---|---|
| committer | Max Horn | 2011-02-07 17:52:38 +0000 |
| commit | ab039812e7d0a0202317c61a2cb64874e4d0c410 (patch) | |
| tree | c3069b36ba6e18068fa343416acf485e2d0728e4 /engines/lure/screen.cpp | |
| parent | 8981fa3f164aa8f397df2af8b85d6edfa4bdd883 (diff) | |
| download | scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.tar.gz scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.tar.bz2 scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.zip | |
COMMON: OSystem now has a PaletteManager
svn-id: r55806
Diffstat (limited to 'engines/lure/screen.cpp')
| -rw-r--r-- | engines/lure/screen.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp index ce353aa04a..d00d969770 100644 --- a/engines/lure/screen.cpp +++ b/engines/lure/screen.cpp @@ -44,7 +44,7 @@ Screen::Screen(OSystem &system): _system(system), _palette(new Palette(GAME_PALETTE_RESOURCE_ID, RGB64)) { int_disk = this; _screen->empty(); - _system.setPalette(_palette->data(), 0, GAME_COLOURS); + _system.getPaletteManager()->setPalette(_palette->data(), 0, GAME_COLOURS); } Screen::~Screen() { @@ -57,13 +57,13 @@ Screen::~Screen() { void Screen::setPaletteEmpty(int numEntries) { Palette emptyPalette(numEntries, NULL, RGB64); - _system.setPalette(emptyPalette.data(), 0, numEntries); + _system.getPaletteManager()->setPalette(emptyPalette.data(), 0, numEntries); _palette->copyFrom(&emptyPalette); /* delete _palette; _palette = new Palette(); - _system.setPalette(_palette->data(), 0, numEntries); + _system.getPaletteManager()->setPalette(_palette->data(), 0, numEntries); */ _system.updateScreen(); } @@ -73,7 +73,7 @@ void Screen::setPaletteEmpty(int numEntries) { void Screen::setPalette(Palette *p) { _palette->copyFrom(p); - _system.setPalette(_palette->data(), 0, GAME_COLOURS); + _system.getPaletteManager()->setPalette(_palette->data(), 0, GAME_COLOURS); _system.updateScreen(); } @@ -82,7 +82,7 @@ void Screen::setPalette(Palette *p) { void Screen::setPalette(Palette *p, uint16 start, uint16 num) { _palette->palette()->copyFrom(p->palette(), start * 4, start * 4, num * 4); - _system.setPalette(_palette->data(), start, num); + _system.getPaletteManager()->setPalette(_palette->data(), start, num); _system.updateScreen(); } @@ -114,7 +114,7 @@ void Screen::paletteFadeIn(Palette *p) { } if (changed) { - _system.setPalette(_palette->data(), 0, p->numEntries()); + _system.getPaletteManager()->setPalette(_palette->data(), 0, p->numEntries()); _system.updateScreen(); _system.delayMillis(20); while (events.pollEvent()) @@ -147,7 +147,7 @@ void Screen::paletteFadeOut(int numEntries) { } if (changed) { - _system.setPalette(_palette->data(), 0, numEntries); + _system.getPaletteManager()->setPalette(_palette->data(), 0, numEntries); _system.updateScreen(); _system.delayMillis(20); while (events.pollEvent()) |