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

Merge branch 'master' into wip/gettext

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-02-15 17:35:24 +01:00
commit 974f535809
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/blupi.h
View File

@ -34,6 +34,12 @@ typedef Sint32 LPARAM;
#define LOWORD(l) ((Uint16) (((Uint32) (l)) & 0xffff))
#define HIWORD(l) ((Uint16) ((((Uint32) (l)) >> 16) & 0xffff))
#ifdef _WIN32
#define countof(a) _countof (a)
#else /* _WIN32 */
#define countof(a) (sizeof (a) / sizeof (*a))
#endif /* !_WIN32 */
#define MAX_PATH 260
#define VK_END 0x23

1
src/event.cpp
View File

@ -4319,6 +4319,7 @@ bool CEvent::DemoPlayStart()
nb = fread (&header, sizeof (DemoHeader), 1, file);
if (nb < 1)
{
fclose (file);
DemoPlayStop();
return false;
}

6
src/pixmap.cpp
View File

@ -51,9 +51,9 @@ CPixmap::CPixmap()
CPixmap::~CPixmap()
{
Sint32 i;
unsigned int i;
for (i = 0; i < MAXIMAGE; i++)
for (i = 0; i < countof (m_lpSDLCursors); i++)
{
if (m_lpSDLCursors[i])
{
@ -62,7 +62,7 @@ CPixmap::~CPixmap()
}
}
for (i = 0 ; i < MAXIMAGE ; i++)
for (i = 0 ; i < countof (m_lpSDLTexture) ; i++)
{
if (m_lpSDLTexture[i] != nullptr)
{