duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shut up some Clang warnings in the Enhanced branch

Browse source 
Once again SDL2 using plain ints everywhere causes issues.
This commit is contained in:
Clownacy 2019-06-27 18:01:55 +00:00
parent 26af89d5bb
commit 21d5ba34b0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Draw.cpp
View file

@ -388,7 +388,7 @@ BOOL ReloadBitmap_Resource(const char *res, Surface_Ids surf_no)
static SDL_Rect RectToSDLRect(RECT *rect) static SDL_Rect RectToSDLRect(RECT *rect)
{ {
SDL_Rect SDLRect = {rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top}; SDL_Rect SDLRect = {(int)rect->left, (int)rect->top, (int)(rect->right - rect->left), (int)(rect->bottom - rect->top)};
if (SDLRect.w < 0) if (SDLRect.w < 0)
SDLRect.w = 0; SDLRect.w = 0;
if (SDLRect.h < 0) if (SDLRect.h < 0)
@ -468,7 +468,7 @@ void PutBitmap4(RECT *rcView, int x, int y, RECT *rect, Surface_Ids surf_no) //
void Surface2Surface(int x, int y, RECT *rect, int to, int from) void Surface2Surface(int x, int y, RECT *rect, int to, int from)
{ {
// Get rects // Get rects
SDL_Rect rcSet = {x * magnification, y * magnification, (rect->right - rect->left) * magnification, (rect->bottom - rect->top) * magnification}; SDL_Rect rcSet = {x * magnification, y * magnification, (int)(rect->right - rect->left) * magnification, (int)(rect->bottom - rect->top) * magnification};
SDL_Rect frameRect = RectToSDLRectScaled(rect); SDL_Rect frameRect = RectToSDLRectScaled(rect);
SDL_BlitSurface(surf[from].surface, &frameRect, surf[to].surface, &rcSet); SDL_BlitSurface(surf[from].surface, &frameRect, surf[to].surface, &rcSet);