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

SCI: renamed SciPalette to GfxPalette, Screen to GfxScreen, GfxPalette is now called directly w/o SciGui

Browse source 
svn-id: r47752
This commit is contained in:
Martin Kiewitz 2010-01-31 16:21:11 +00:00
parent c991a5bceb
commit 72c2d360f7
41 changed files with 172 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/sci/sci.cpp
View file

@ -141,15 +141,15 @@ Common::Error SciEngine::run() {
upscaledHires = true;
// Initialize graphics-related parts
Screen *screen = 0;
GfxScreen *screen = 0;
// invokes initGraphics()
if (_resMan->detectHires())
screen = new Screen(_resMan, 640, 480, false);
screen = new GfxScreen(_resMan, 640, 480, false);
else
screen = new Screen(_resMan, 320, 200, upscaledHires);
screen = new GfxScreen(_resMan, 320, 200, upscaledHires);
SciPalette *palette = new SciPalette(_resMan, screen);
GfxPalette *palette = new GfxPalette(_resMan, screen);
Cursor *cursor = new Cursor(_resMan, palette, screen);
// Create debugger console. It requires GFX to be initialized
@ -184,7 +184,8 @@ Common::Error SciEngine::run() {
_gamestate->_ports = new GfxPorts(_segMan, _screen);
_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio);
#endif
_gamestate->_screen = screen;
_gamestate->_gfxPalette = palette;
_gamestate->_gfxScreen = screen;
if (game_init(_gamestate)) { /* Initialize */
warning("Game initialization failed: Aborting...");