shithub: cstory

Info  •  Files  •  Log  •  Branches

Shut up some MSVC2003 warnings

--- a/src/Font.cpp

+++ b/src/Font.cpp

@@ -1707,7 +1707,7 @@

 	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)

 	{

--- a/src/MapName.cpp

+++ b/src/MapName.cpp

@@ -33,7 +33,7 @@

 	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 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);

--- a/src/Resource.cpp

+++ b/src/Resource.cpp

@@ -427,7 +427,7 @@

 	if (!resource)

 		return NULL;

-	SDL_RWops *fp = SDL_RWFromConstMem(resource, resSize);

+	SDL_RWops *fp = SDL_RWFromConstMem(resource, (int)resSize);

 	if (!fp)

 	{

--- a/src/TextScr.cpp

+++ b/src/TextScr.cpp

@@ -375,7 +375,7 @@

 	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)

 	{