libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-24 10:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Some fixes for zoom cursors

Browse Source 
- Now the cursor buffer is initialized outside the mouse movement code, thus saving
a memcpy there
- Plugged some memory leaks
- Removed an obsolete check

svn-id: r53028
This commit is contained in:
Filippos Karapetis 2010-10-05 10:30:26 +00:00
parent 61afea6cbe
commit c8fd37c9f0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/sci/graphics/cursor.cpp
View File

@ -58,10 +58,12 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc
_zoomPicView = 0;
_zoomColor = 0;
_zoomMultiplier = 0;
_cursorSurface = 0;
}
GfxCursor::~GfxCursor() {
purgeCache();
kernelClearZoomZone();
}
void GfxCursor::init(GfxCoordAdjuster *coordAdjuster, EventManager *event) {
@ -368,15 +370,12 @@ void GfxCursor::refreshPosition() {
// Cursor
const CelInfo *cursorCelInfo = _zoomCursorView->getCelInfo(_zoomCursorLoop, _zoomCursorCel);
const byte *cursorBitmap = _zoomCursorView->getBitmap(_zoomCursorLoop, _zoomCursorCel);
byte *finalBitmap = new byte[cursorCelInfo->width * cursorCelInfo->height];
// Pic
const CelInfo *picCelInfo = _zoomPicView->getCelInfo(0, 0);
const byte *rawPicBitmap = _zoomPicView->getBitmap(0, 0);
// Compute hotspot from xoffset/yoffset
Common::Point cursorHotspot = Common::Point((cursorCelInfo->width >> 1) - cursorCelInfo->displaceX, cursorCelInfo->height - cursorCelInfo->displaceY - 1);
memcpy(finalBitmap, cursorBitmap, cursorCelInfo->width * cursorCelInfo->height);
uint16 targetX = CLIP<int>((mousePoint.x - _zoomZone.left) * _zoomMultiplier, 0, picCelInfo->width - cursorCelInfo->width);
uint16 targetY = CLIP<int>((mousePoint.y - _zoomZone.top) * _zoomMultiplier, 0, picCelInfo->height - cursorCelInfo->height);
@ -384,15 +383,13 @@ void GfxCursor::refreshPosition() {
for (int x = 0; x < cursorCelInfo->width; x++) {
for (int y = 0; y < cursorCelInfo->height; y++) {
int curPos = cursorCelInfo->width * y + x;
if (finalBitmap[curPos] == _zoomColor) {
finalBitmap[curPos] = rawPicBitmap[picCelInfo->width * (targetY + y) + (targetX + x)];
if (cursorBitmap[curPos] == _zoomColor) {
_cursorSurface[curPos] = rawPicBitmap[picCelInfo->width * (targetY + y) + (targetX + x)];
}
}
}
CursorMan.replaceCursor((const byte *)finalBitmap, cursorCelInfo->width, cursorCelInfo->height, cursorHotspot.x, cursorHotspot.y, cursorCelInfo->clearKey);
delete[] finalBitmap;
CursorMan.replaceCursor((const byte *)_cursorSurface, cursorCelInfo->width, cursorCelInfo->height, cursorHotspot.x, cursorHotspot.y, cursorCelInfo->clearKey);
}
}
@ -413,13 +410,11 @@ void GfxCursor::kernelClearZoomZone() {
_zoomZoneActive = false;
delete _zoomCursorView;
delete _zoomPicView;
delete[] _cursorSurface;
}
void GfxCursor::kernelSetZoomZone(byte multiplier, Common::Rect zone, GuiResourceId viewNum, int loopNum, int celNum, GuiResourceId picNum, byte zoomColor) {
if (multiplier != 1 && multiplier != 2) {
warning("kernelSetZoomZone: Unsupported magnifier %d", multiplier);
return;
}
kernelClearZoomZone();
_zoomMultiplier = multiplier;
@ -427,6 +422,10 @@ void GfxCursor::kernelSetZoomZone(byte multiplier, Common::Rect zone, GuiResourc
_zoomCursorLoop = (byte)loopNum;
_zoomCursorCel = (byte)celNum;
_zoomPicView = new GfxView(_resMan, _screen, _palette, picNum);
const CelInfo *cursorCelInfo = _zoomCursorView->getCelInfo(_zoomCursorLoop, _zoomCursorCel);
const byte *cursorBitmap = _zoomCursorView->getBitmap(_zoomCursorLoop, _zoomCursorCel);
_cursorSurface = new byte[cursorCelInfo->width * cursorCelInfo->height];
memcpy(_cursorSurface, cursorBitmap, cursorCelInfo->width * cursorCelInfo->height);
_zoomZone = zone;
kernelSetMoveZone(_zoomZone);

1
engines/sci/graphics/cursor.h
View File

@ -107,6 +107,7 @@ private:
GfxView *_zoomPicView;
byte _zoomColor;
byte _zoomMultiplier;
byte *_cursorSurface;
CursorCache _cachedCursors;