[Scummvm-cvs-logs] scummvm master -> b4ddd5c4134b853ed1e76bd1404d8d332cd0e609
dreammaster
dreammaster at scummvm.org
Mon Nov 11 04:01:14 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b4ddd5c413 TSAGE: Fix bug with scene objects briefly flashing when changing scene
Commit: b4ddd5c4134b853ed1e76bd1404d8d332cd0e609
https://github.com/scummvm/scummvm/commit/b4ddd5c4134b853ed1e76bd1404d8d332cd0e609
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-10T19:00:38-08:00
Commit Message:
TSAGE: Fix bug with scene objects briefly flashing when changing scene
Changed paths:
engines/tsage/graphics.cpp
engines/tsage/graphics.h
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index b6beb03..595c43a 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1079,16 +1079,9 @@ bool GfxButton::process(Event &event) {
GfxDialog::GfxDialog() {
_savedArea = NULL;
_defaultButton = NULL;
-
- // For Return to Ringworld 2, backup palette when showing a dialog
- if (g_vm->getGameID() == GType_Ringworld2)
- g_system->getPaletteManager()->grabPalette(&_savedPalette[0], 0, 256);
}
GfxDialog::~GfxDialog() {
- if (g_vm->getGameID() == GType_Ringworld2)
- g_system->getPaletteManager()->setPalette(&_savedPalette[0], 0, 256);
-
remove();
}
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index 365929e..858731a 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -321,7 +321,6 @@ public:
GfxElementList _elements;
GfxButton *_defaultButton;
GfxSurface *_savedArea;
- byte _savedPalette[256 * 3];
public:
GfxDialog();
virtual ~GfxDialog();
More information about the Scummvm-git-logs
mailing list