thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the spaces before tabs.

Browse source 
svn-id: r30667
This commit is contained in:
Jordi Vilalta Prat 2008-01-28 00:14:17 +00:00
parent 66e9d4f5e8
commit d6c34bdc4b
207 changed files with 6067 additions and 6067 deletions
Download patch file Download diff file Expand all files Collapse all files

46
backends/platform/sdl/graphics.cpp
View file

@ -1289,29 +1289,29 @@ void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x,
_mouseKeyColor = keycolor;
_cursorTargetScale = cursorTargetScale;
_cursorTargetScale = cursorTargetScale;
if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
_mouseCurState.w = w;
_mouseCurState.h = h;
if (_mouseCurState.w != (int)w || _mouseCurState.h != (int)h) {
_mouseCurState.w = w;
_mouseCurState.h = h;
if (_mouseOrigSurface)
SDL_FreeSurface(_mouseOrigSurface);
if (_mouseOrigSurface)
SDL_FreeSurface(_mouseOrigSurface);
// Allocate bigger surface because AdvMame2x adds black pixel at [0,0]
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
_mouseCurState.w + 2,
_mouseCurState.h + 2,
16,
_hwscreen->format->Rmask,
_hwscreen->format->Gmask,
_hwscreen->format->Bmask,
_hwscreen->format->Amask);
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
_mouseCurState.w + 2,
_mouseCurState.h + 2,
16,
_hwscreen->format->Rmask,
_hwscreen->format->Gmask,
_hwscreen->format->Bmask,
_hwscreen->format->Amask);
if (_mouseOrigSurface == NULL)
error("allocating _mouseOrigSurface failed");
SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
}
if (_mouseOrigSurface == NULL)
error("allocating _mouseOrigSurface failed");
SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
}
free(_mouseData);
@ -1327,7 +1327,7 @@ void OSystem_SDL::blitCursor() {
int w, h, i, j;
if (!_mouseOrigSurface || !_mouseData)
return;
return;
w = _mouseCurState.w;
h = _mouseCurState.h;
@ -1364,7 +1364,7 @@ void OSystem_SDL::blitCursor() {
srcPtr++;
}
dstPtr += _mouseOrigSurface->pitch - w * 2;
}
}
int rW, rH;
@ -1405,7 +1405,7 @@ void OSystem_SDL::blitCursor() {
_mouseCurState.vH = h;
_mouseCurState.vHotX = _mouseCurState.hotX;
_mouseCurState.vHotY = _mouseCurState.hotY;
}
}
#ifndef DISABLE_SCALERS
int rH1 = rH; // store original to pass to aspect-correction function later
@ -1436,7 +1436,7 @@ void OSystem_SDL::blitCursor() {
error("allocating _mouseSurface failed");
SDL_SetColorKey(_mouseSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
}
}
SDL_LockSurface(_mouseSurface);
@ -1510,7 +1510,7 @@ void OSystem_SDL::undrawMouse() {
void OSystem_SDL::drawMouse() {
if (!_mouseVisible || !_mouseSurface) {
_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
return;
return;
}
SDL_Rect dst;