backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Change some Sint32 to MouseSprites

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-08-13 21:41:06 +02:00
parent 03e12faa48
commit 7f3f7e4f37
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pixmap.cxx
View File

@ -662,7 +662,7 @@ RECT CPixmap::MouseRectSprite ()
return rcRect; return rcRect;
} }
SDL_Point CPixmap::GetCursorHotSpot (Sint32 sprite) SDL_Point CPixmap::GetCursorHotSpot (MouseSprites sprite)
{ {
static const Sint32 hotspots[MAXCURSORS * 2] = { static const Sint32 hotspots[MAXCURSORS * 2] = {
30, 30, // SPRITE_ARROW 30, 30, // SPRITE_ARROW
@ -694,7 +694,7 @@ SDL_Point CPixmap::GetCursorHotSpot (Sint32 sprite)
return hotspot; return hotspot;
} }
SDL_Rect CPixmap::GetCursorRect (Sint32 sprite) SDL_Rect CPixmap::GetCursorRect (MouseSprites sprite)
{ {
Sint32 rank; Sint32 rank;
SDL_Rect rcRect; SDL_Rect rcRect;
@ -773,10 +773,11 @@ on the endianness (byte order) of the machine */
amask = 0xff000000; amask = 0xff000000;
#endif #endif
for (int sprite = SPRITE_BEGIN; sprite <= SPRITE_END; ++sprite) for (int i = SPRITE_BEGIN; i <= SPRITE_END; ++i)
{ {
SDL_Point hotspot = this->GetCursorHotSpot (sprite); MouseSprites sprite = static_cast<MouseSprites> (i);
SDL_Rect rect = this->GetCursorRect (sprite); SDL_Point hotspot = this->GetCursorHotSpot (sprite);
SDL_Rect rect = this->GetCursorRect (sprite);
SDL_Surface * surface = SDL_Surface * surface =
SDL_CreateRGBSurface (0, rect.w, rect.h, 32, rmask, gmask, bmask, amask); SDL_CreateRGBSurface (0, rect.w, rect.h, 32, rmask, gmask, bmask, amask);

4
src/pixmap.h
View File

@ -96,8 +96,8 @@ protected:
SDL_BlendMode = SDL_BLENDMODE_BLEND); SDL_BlendMode = SDL_BLENDMODE_BLEND);
RECT MouseRectSprite (); RECT MouseRectSprite ();
SDL_Point GetCursorHotSpot (Sint32 sprite); SDL_Point GetCursorHotSpot (MouseSprites sprite);
SDL_Rect GetCursorRect (Sint32 sprite); SDL_Rect GetCursorRect (MouseSprites sprite);
protected: protected:
bool m_bDebug; bool m_bDebug;