shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge branch 'accurate' into portable

--- a/src/GenericLoad.cpp

+++ b/src/GenericLoad.cpp

@@ -198,15 +198,15 @@

 	else

 	{

 		MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_SCREEN_GRAB, TRUE);

-		MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_LEVEL_BACKGROUND, FALSE);

+		MakeSurface_Generic(320, 240, SURFACE_ID_LEVEL_BACKGROUND, FALSE);

 		MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_MAP, TRUE);

-		MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_CASTS, FALSE);

+		MakeSurface_Generic(320, 240, SURFACE_ID_CASTS, FALSE);

 		MakeSurface_Generic(256, 256, SURFACE_ID_LEVEL_TILESET, FALSE);

 		MakeSurface_Generic(160, 16, SURFACE_ID_ROOM_NAME, FALSE);

 		MakeSurface_Generic(40, 240, SURFACE_ID_VALUE_VIEW, FALSE);

 		MakeSurface_Generic(320, 240, SURFACE_ID_LEVEL_SPRITESET_1, FALSE);

 		MakeSurface_Generic(320, 240, SURFACE_ID_LEVEL_SPRITESET_2, FALSE);

-		MakeSurface_Generic(WINDOW_WIDTH, 16 * MAX_STRIP, SURFACE_ID_CREDIT_CAST, FALSE);

+		MakeSurface_Generic(320, 16 * MAX_STRIP, SURFACE_ID_CREDIT_CAST, FALSE);

 		pt_size = 0;

 		pt_size += MakePixToneObject(&gPtpTable[0], 2, 32);

--- a/src/MiniMap.cpp

+++ b/src/MiniMap.cpp

@@ -216,7 +216,7 @@

 void StartMapping()

 {

-	memset(gMapping, FALSE, 0x80);

+	memset(gMapping, FALSE, sizeof(gMapping));

 }

 void SetMapping(int a)

-- 

⑨