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

Shut up some MSVC2003 warnings

Browse source
This commit is contained in:
Clownacy 2019-03-11 03:40:51 +00:00
parent c7f5cb71e0
commit c9b681299c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Font.cpp
View file

@ -1707,7 +1707,7 @@ FontObject* LoadFontFromData(const unsigned char *data, size_t data_size, unsign
font_object->data = (unsigned char*)malloc(data_size);
memcpy(font_object->data, data, data_size);
FT_Error error = FT_New_Memory_Face(font_object->library, font_object->data, data_size, 0, &font_object->face);
FT_Error error = FT_New_Memory_Face(font_object->library, font_object->data, (FT_Long)data_size, 0, &font_object->face);
if (error)
{

4
src/MapName.cpp
View file

@ -33,7 +33,7 @@ void ReadyMapName(const char *str)
strcpy(gMapName.name, str);
//Draw the text to the surface
int len = strlen(gMapName.name);
int len = (int)strlen(gMapName.name);
CortBox2(&rc, 0, SURFACE_ID_ROOM_NAME);
PutText2((-6 * len + 160) / 2 + 6, 1, gMapName.name, RGB(0x11, 0x00, 0x22), SURFACE_ID_ROOM_NAME);
@ -66,7 +66,7 @@ void StartMapName()
void RestoreMapName()
{
int len = strlen(gMapName.name);
int len = (int)strlen(gMapName.name);
CortBox2(&rc, 0, SURFACE_ID_ROOM_NAME);
PutText2((-6 * len + 160) / 2 + 6, 1, gMapName.name, RGB(0x11, 0x00, 0x22), SURFACE_ID_ROOM_NAME);

2
src/Resource.cpp
View file

@ -427,7 +427,7 @@ SDL_RWops* FindResource(const char *name)
if (!resource)
return NULL;
SDL_RWops *fp = SDL_RWFromConstMem(resource, resSize);
SDL_RWops *fp = SDL_RWFromConstMem(resource, (int)resSize);
if (!fp)
{

2
src/TextScr.cpp
View file

@ -375,7 +375,7 @@ void SetNumberTextScript(int index)
gTS.wait_beam = 0;
//Check if should move to next line (prevent a memory overflow, come on guys, this isn't a leftover of pixel trying to make text wrapping)
gTS.p_write += strlen(str);
gTS.p_write += (unsigned int)strlen(str);
if (gTS.p_write >= 35)
{