From cbfef2eb5384b1c3dbc7f5cf8e4db04cc1d02a94 Mon Sep 17 00:00:00 2001 From: Ally Date: Wed, 30 Nov 2022 14:31:36 -0400 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Misa Elizabeth Kai --- desktop_version/src/Render.cpp | 11 ++++++----- desktop_version/src/Script.cpp | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 2713e03c..9e6dbec9 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -24,7 +24,8 @@ static int tr; static int tg; static int tb; -struct MapRenderData { +struct MapRenderData +{ int width; int height; int zoom; @@ -2096,7 +2097,7 @@ static void rendermap(void) static void rendermapfog(void) { - MapRenderData data = getmaprenderdata(); + const MapRenderData data = getmaprenderdata(); for (int j = 0; j < data.height; j++) { @@ -2121,7 +2122,7 @@ static void rendermaplegend(void) { // Draw the map legend, aka teleports/targets/trinkets - MapRenderData data = getmaprenderdata(); + const MapRenderData data = getmaprenderdata(); const int tile_offset = graphics.flipmode ? 3 : 0; @@ -2151,7 +2152,7 @@ static void rendermaplegend(void) static void rendermapcursor(const bool flashing) { - MapRenderData data = getmaprenderdata(); + const MapRenderData data = getmaprenderdata(); if (!map.custommode && game.roomx == 109) { @@ -2686,7 +2687,7 @@ void teleporterrender(void) // Draw a box around the currently selected teleporter - MapRenderData data = getmaprenderdata(); + const MapRenderData data = getmaprenderdata(); if (game.useteleporter) { diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 73a3a0dd..7287ede7 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -2889,7 +2889,6 @@ void scriptclass::startgamemode( int t ) map.gotoroom(game.saverx, game.savery); map.initmapdata(); - cl.generatecustomminimap(); map.customshowmm = true;