diff options
author | Filippos Karapetis | 2011-01-09 13:21:19 +0000 |
---|---|---|
committer | Filippos Karapetis | 2011-01-09 13:21:19 +0000 |
commit | 5d7729be320ec149a6bb1bab1a4dece89b431e16 (patch) | |
tree | ce4d20570107de2b5d2f419f603249b239e4df7a | |
parent | 3c8689fb7b8ba5bba07d5bb2a52627c582aa479e (diff) | |
download | scummvm-rg350-5d7729be320ec149a6bb1bab1a4dece89b431e16.tar.gz scummvm-rg350-5d7729be320ec149a6bb1bab1a4dece89b431e16.tar.bz2 scummvm-rg350-5d7729be320ec149a6bb1bab1a4dece89b431e16.zip |
SCI: Cleanup
svn-id: r55182
-rw-r--r-- | engines/sci/graphics/cache.h | 2 | ||||
-rw-r--r-- | engines/sci/graphics/font.cpp | 1 | ||||
-rw-r--r-- | engines/sci/graphics/font.h | 1 | ||||
-rw-r--r-- | engines/sci/graphics/frameout.h | 2 | ||||
-rw-r--r-- | engines/sci/graphics/screen.cpp | 4 |
5 files changed, 4 insertions, 6 deletions
diff --git a/engines/sci/graphics/cache.h b/engines/sci/graphics/cache.h index 2e9a345230..140c96ecd0 100644 --- a/engines/sci/graphics/cache.h +++ b/engines/sci/graphics/cache.h @@ -45,8 +45,8 @@ public: ~GfxCache(); GfxFont *getFont(GuiResourceId fontId); - GfxView *getView(GuiResourceId viewId); + int16 kernelViewGetCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo); int16 kernelViewGetCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo); int16 kernelViewGetLoopCount(GuiResourceId viewId); diff --git a/engines/sci/graphics/font.cpp b/engines/sci/graphics/font.cpp index 3a6ab75cd0..1b9133108f 100644 --- a/engines/sci/graphics/font.cpp +++ b/engines/sci/graphics/font.cpp @@ -116,7 +116,6 @@ void GfxFontFromResource::drawToBuffer(uint16 chr, int16 top, int16 left, byte c if ((done & 7) == 0) // fetching next data byte b = *(pIn++) & mask; if (b & 0x80) { // if MSB is set - paint it - _screen->putFontPixel(top, left + done, y, color); int offset = (top + y) * bufWidth + (left + done); buffer[offset] = color; } diff --git a/engines/sci/graphics/font.h b/engines/sci/graphics/font.h index d8afb73a73..9d2b37c1f2 100644 --- a/engines/sci/graphics/font.h +++ b/engines/sci/graphics/font.h @@ -40,6 +40,7 @@ public: virtual bool isDoubleByte(uint16 chr) { return false; } virtual byte getCharWidth(uint16 chr) { return 0; } virtual void draw(uint16 chr, int16 top, int16 left, byte color, bool greyedOutput) {} + virtual void drawToBuffer(uint16 chr, int16 top, int16 left, byte color, bool greyedOutput, byte *buffer, int16 width, int16 height) {} }; diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h index bd708dbc79..93d61ba22e 100644 --- a/engines/sci/graphics/frameout.h +++ b/engines/sci/graphics/frameout.h @@ -109,7 +109,7 @@ private: GfxScreen *_screen; GfxPaint32 *_paint32; - Common::List<FrameoutEntry *> _screenItems; + FrameoutList _screenItems; PlaneList _planes; PlanePictureList _planePictures; diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index 5a96a3167f..80edb0b830 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -147,15 +147,13 @@ void GfxScreen::copyToScreen() { } void GfxScreen::copyFromScreen(byte *buffer) { - Graphics::Surface *screen; - screen = g_system->lockScreen(); + Graphics::Surface *screen = g_system->lockScreen(); memcpy(buffer, screen->pixels, _displayPixels); g_system->unlockScreen(); } void GfxScreen::kernelSyncWithFramebuffer() { Graphics::Surface *screen = g_system->lockScreen(); - memcpy(_displayScreen, screen->pixels, _displayPixels); g_system->unlockScreen(); } |