libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 15:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: removed OSystem from SciGuiScreen

Browse Source 
svn-id: r44731
This commit is contained in:
Martin Kiewitz 2009-10-07 12:52:21 +00:00
parent 77b549a0ad
commit 337dbf2289
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/sci/gui/gui_screen.cpp
View File

@ -33,8 +33,8 @@
namespace Sci {
SciGuiScreen::SciGuiScreen(OSystem *system, int16 width, int16 height, int16 scaleFactor) :
_system(system), _width(width), _height(height) {
SciGuiScreen::SciGuiScreen(int16 width, int16 height, int16 scaleFactor) :
_width(width), _height(height) {
int i;
uint16 base = 0;
@ -73,7 +73,7 @@ byte *SciGuiScreen::initScreen(uint16 pixelCount) {
}
void SciGuiScreen::copyToScreen() {
_system->copyRectToScreen(_displayScreen, _displayWidth, 0, 0, _displayWidth, _displayHeight);
g_system->copyRectToScreen(_displayScreen, _displayWidth, 0, 0, _displayWidth, _displayHeight);
}
byte SciGuiScreen::getDrawingMask(byte color, byte prio, byte control) {
@ -205,7 +205,7 @@ void SciGuiScreen::setPalette(GuiPalette*pal) {
// just copy palette to system
byte bpal[4 * 256];
// Get current palette, update it and put back
_system->grabPalette(bpal, 0, 256);
g_system->grabPalette(bpal, 0, 256);
for (int16 i = 0; i < 256; i++) {
if (!pal->colors[i].used)
continue;
@ -214,7 +214,7 @@ void SciGuiScreen::setPalette(GuiPalette*pal) {
bpal[i * 4 + 2] = pal->colors[i].b * pal->intensity[i] / 100;
bpal[i * 4 + 3] = 100;
}
_system->setPalette(bpal, 0, 256);
g_system->setPalette(bpal, 0, 256);
}
// Currently not really done, its supposed to be possible to only dither _visualScreen

4
engines/sci/gui/gui_screen.h
View File

@ -41,7 +41,7 @@ namespace Sci {
class SciGuiScreen {
public:
SciGuiScreen(OSystem *system, int16 width = 320, int16 height = 200, int16 scaleFactor = 1);
SciGuiScreen(int16 width = 320, int16 height = 200, int16 scaleFactor = 1);
~SciGuiScreen();
byte *initScreen(uint16 pixelCount);
@ -76,8 +76,6 @@ private:
void restoreBitsScreen(Common::Rect rect, byte *&memoryPtr, byte *screen);
void saveBitsScreen(Common::Rect rect, byte *screen, byte *&memoryPtr);
OSystem *_system;
uint16 _baseTable[SCI_SCREEN_MAXHEIGHT];
uint16 _baseDisplayTable[SCI_SCREEN_MAXHEIGHT];

2
engines/sci/sci.cpp
View File

@ -157,7 +157,7 @@ Common::Error SciEngine::run() {
GfxState gfx_state;
_gamestate->gfx_state = &gfx_state;
SciGuiScreen *screen = new SciGuiScreen(_system);
SciGuiScreen *screen = new SciGuiScreen();
SciGuiPalette *palette = new SciGuiPalette(_gamestate, screen);
SciGuiCursor *cursor = new SciGuiCursor(_gamestate, palette);