[Scummvm-cvs-logs] SF.net SVN: scummvm:[55182] scummvm/trunk/engines/sci/graphics
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sun Jan 9 14:21:19 CET 2011
Revision: 55182
http://scummvm.svn.sourceforge.net/scummvm/?rev=55182&view=rev
Author: thebluegr
Date: 2011-01-09 13:21:19 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
SCI: Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/cache.h
scummvm/trunk/engines/sci/graphics/font.cpp
scummvm/trunk/engines/sci/graphics/font.h
scummvm/trunk/engines/sci/graphics/frameout.h
scummvm/trunk/engines/sci/graphics/screen.cpp
Modified: scummvm/trunk/engines/sci/graphics/cache.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/cache.h 2011-01-09 10:16:55 UTC (rev 55181)
+++ scummvm/trunk/engines/sci/graphics/cache.h 2011-01-09 13:21:19 UTC (rev 55182)
@@ -45,8 +45,8 @@
~GfxCache();
GfxFont *getFont(GuiResourceId fontId);
+ GfxView *getView(GuiResourceId viewId);
- GfxView *getView(GuiResourceId viewId);
int16 kernelViewGetCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo);
int16 kernelViewGetCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo);
int16 kernelViewGetLoopCount(GuiResourceId viewId);
Modified: scummvm/trunk/engines/sci/graphics/font.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/font.cpp 2011-01-09 10:16:55 UTC (rev 55181)
+++ scummvm/trunk/engines/sci/graphics/font.cpp 2011-01-09 13:21:19 UTC (rev 55182)
@@ -116,7 +116,6 @@
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;
}
Modified: scummvm/trunk/engines/sci/graphics/font.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/font.h 2011-01-09 10:16:55 UTC (rev 55181)
+++ scummvm/trunk/engines/sci/graphics/font.h 2011-01-09 13:21:19 UTC (rev 55182)
@@ -40,6 +40,7 @@
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) {}
};
Modified: scummvm/trunk/engines/sci/graphics/frameout.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/frameout.h 2011-01-09 10:16:55 UTC (rev 55181)
+++ scummvm/trunk/engines/sci/graphics/frameout.h 2011-01-09 13:21:19 UTC (rev 55182)
@@ -109,7 +109,7 @@
GfxScreen *_screen;
GfxPaint32 *_paint32;
- Common::List<FrameoutEntry *> _screenItems;
+ FrameoutList _screenItems;
PlaneList _planes;
PlanePictureList _planePictures;
Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp 2011-01-09 10:16:55 UTC (rev 55181)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp 2011-01-09 13:21:19 UTC (rev 55182)
@@ -147,15 +147,13 @@
}
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();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list