libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-07 03:18:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix cursor

Browse Source
This commit is contained in:
Martin T. H. Sandsmark 2018-07-17 12:46:49 +02:00 committed by Filippos Karapetis
parent fcff230fe8
commit ab000b6ae3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -2043,8 +2043,8 @@ void SurfaceSdlGraphicsManager::setMouseCursor(const void *buf, uint w, uint h,
}
void SurfaceSdlGraphicsManager::blitCursor() {
const uint w = _mouseCurState.w;
const uint h = _mouseCurState.h;
const int w = _mouseCurState.w;
const int h = _mouseCurState.h;
if (!w || !h || !_mouseOrigSurface) {
return;
@ -2158,12 +2158,12 @@ void SurfaceSdlGraphicsManager::blitCursor() {
dstPtr = (byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * i;
for (uint j = 0; j < w + _maxExtraPixels * 2; j++) {
*(uint16 *)dstPtr = kMouseColorKey;
dstPtr += _cursorFormat.bytesPerPixel;
dstPtr += _mouseOrigSurface->format->BytesPerPixel;
}
}
// Draw from [_maxExtraPixels,_maxExtraPixels] since scalers will read past boudaries
dstPtr = (byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _cursorFormat.bytesPerPixel;
dstPtr = (byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _mouseOrigSurface->format->BytesPerPixel;
SDL_Color *palette;
@ -2172,8 +2172,8 @@ void SurfaceSdlGraphicsManager::blitCursor() {
else
palette = _cursorPalette;
for (uint i = 0; i < h; i++) {
for (uint j = 0; j < w; j++) {
for (int i = 0; i < h; i++) {
for (int j = 0; j < w; j++) {
if (_cursorFormat.bytesPerPixel == 2) {
color = *(const uint16 *)srcPtr;
if (color != _mouseKeyColor) {
@ -2181,7 +2181,7 @@ void SurfaceSdlGraphicsManager::blitCursor() {
_cursorFormat.colorToRGB(color, r, g, b);
*(uint16 *)dstPtr = SDL_MapRGB(_mouseOrigSurface->format, r, g, b);
}
dstPtr += _cursorFormat.bytesPerPixel;
dstPtr += _mouseOrigSurface->format->BytesPerPixel;
srcPtr += _cursorFormat.bytesPerPixel;
} else {
color = *srcPtr;
@ -2193,7 +2193,7 @@ void SurfaceSdlGraphicsManager::blitCursor() {
srcPtr++;
}
}
dstPtr += _mouseOrigSurface->pitch - w * _cursorFormat.bytesPerPixel;
dstPtr += _mouseOrigSurface->pitch - w * _mouseOrigSurface->format->BytesPerPixel;
}
if (sizeChanged || !_mouseSurface) {
@ -2225,7 +2225,7 @@ void SurfaceSdlGraphicsManager::blitCursor() {
if (_scalerPlugin->canDrawCursor()) {
#endif
_scalerPlugin->scale(
(byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _cursorFormat.bytesPerPixel,
(byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _mouseOrigSurface->format->BytesPerPixel,
_mouseOrigSurface->pitch, (byte *)_mouseSurface->pixels, _mouseSurface->pitch,
_mouseCurState.w, _mouseCurState.h, 0, 0);
#ifdef USE_SCALERS
@ -2233,14 +2233,14 @@ void SurfaceSdlGraphicsManager::blitCursor() {
int tmpFactor = _normalPlugin->getFactor();
_normalPlugin->setFactor(_videoMode.scaleFactor);
_normalPlugin->scale(
(byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _cursorFormat.bytesPerPixel,
(byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _mouseOrigSurface->format->BytesPerPixel,
_mouseOrigSurface->pitch, (byte *)_mouseSurface->pixels, _mouseSurface->pitch,
_mouseCurState.w, _mouseCurState.h, 0, 0);
_normalPlugin->setFactor(tmpFactor);
}
} else {
blitSurface(
(byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _cursorFormat.bytesPerPixel,
(byte *)_mouseOrigSurface->pixels + _mouseOrigSurface->pitch * _maxExtraPixels + _maxExtraPixels * _mouseOrigSurface->format->BytesPerPixel,
_mouseOrigSurface->pitch, (byte *)_mouseSurface->pixels, _mouseSurface->pitch,
_mouseCurState.w * 2, _mouseCurState.h);
}