aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-01-28 00:14:17 +0000
committerJordi Vilalta Prat2008-01-28 00:14:17 +0000
commitd6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch)
treee6e98f266610f6428c248aed6abc75e637e45231 /backends/platform/sdl
parent66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff)
downloadscummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz
scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2
scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r--backends/platform/sdl/graphics.cpp48
-rw-r--r--backends/platform/sdl/sdl.h2
2 files changed, 25 insertions, 25 deletions
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index eb71a1ba0e..b9d1e37c05 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -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);
-
- if (_mouseOrigSurface == NULL)
- error("allocating _mouseOrigSurface failed");
- SDL_SetColorKey(_mouseOrigSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, kMouseColorKey);
- }
+ _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);
+ }
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;
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 827e8c300b..1ddd74693c 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -312,7 +312,7 @@ protected:
int16 x, y;
// The size and hotspot of the original cursor image.
- int16 w, h;
+ int16 w, h;
int16 hotX, hotY;
// The size and hotspot of the pre-scaled cursor image, in real