From 869bff3da1235171aad2cb6d662241e4887a18f9 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 12 Oct 2019 16:41:40 +0000 Subject: [PATCH 1/2] These values are arbitrary, not the screen size --- src/GenericLoad.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GenericLoad.cpp b/src/GenericLoad.cpp index 07bdab33..69f8dbe1 100644 --- a/src/GenericLoad.cpp +++ b/src/GenericLoad.cpp @@ -198,15 +198,15 @@ BOOL LoadGenericData() 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); From 709065d716dba7ac4440e608d46b322ec86b56ed Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 12 Oct 2019 16:54:58 +0000 Subject: [PATCH 2/2] Use a sizeof instead of this raw value --- src/MiniMap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MiniMap.cpp b/src/MiniMap.cpp index 650bcd68..2d2a4beb 100644 --- a/src/MiniMap.cpp +++ b/src/MiniMap.cpp @@ -216,7 +216,7 @@ BOOL IsMapping() void StartMapping() { - memset(gMapping, FALSE, 0x80); + memset(gMapping, FALSE, sizeof(gMapping)); } void SetMapping(int a)