From d63ba761d592d545e7a75b90371f0d1f6b25e35e Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Tue, 14 Apr 2020 19:32:30 -0700
Subject: [PATCH] Remove map.numteleporters

This removes the separate length-tracking variable map.numteleporters,
in favor of using map.teleporters.size().
---
 desktop_version/src/Game.cpp   | 2 +-
 desktop_version/src/Input.cpp  | 8 ++++----
 desktop_version/src/Map.cpp    | 1 -
 desktop_version/src/Map.h      | 2 +-
 desktop_version/src/Render.cpp | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index be71bd08..cce6d756 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -5593,7 +5593,7 @@ void Game::initteleportermode()
     //Set the teleporter variable to the right position!
     teleport_to_teleporter = 0;
 
-    for (int i = 0; i < map.numteleporters; i++)
+    for (size_t i = 0; i < map.teleporters.size(); i++)
     {
         if (roomx == map.teleporters[i].x + 100 && roomy == map.teleporters[i].y + 100)
         {
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 08990fd6..d0eba6a3 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -2224,13 +2224,13 @@ void teleporterinput()
         if (game.press_left)
         {
             game.teleport_to_teleporter--;
-            if (game.teleport_to_teleporter < 0) game.teleport_to_teleporter = map.numteleporters - 1;
+            if (game.teleport_to_teleporter < 0) game.teleport_to_teleporter = map.teleporters.size() - 1;
             tempx = map.teleporters[game.teleport_to_teleporter].x;
             tempy = map.teleporters[game.teleport_to_teleporter].y;
             while (map.explored[tempx + (20 * tempy)] == 0)
             {
                 game.teleport_to_teleporter--;
-                if (game.teleport_to_teleporter < 0) game.teleport_to_teleporter = map.numteleporters - 1;
+                if (game.teleport_to_teleporter < 0) game.teleport_to_teleporter = map.teleporters.size() - 1;
                 tempx = map.teleporters[game.teleport_to_teleporter].x;
                 tempy = map.teleporters[game.teleport_to_teleporter].y;
             }
@@ -2238,13 +2238,13 @@ void teleporterinput()
         else if (game.press_right)
         {
             game.teleport_to_teleporter++;
-            if (game.teleport_to_teleporter >= map.numteleporters) game.teleport_to_teleporter = 0;
+            if (game.teleport_to_teleporter >= (int) map.teleporters.size()) game.teleport_to_teleporter = 0;
             tempx = map.teleporters[game.teleport_to_teleporter].x;
             tempy = map.teleporters[game.teleport_to_teleporter].y;
             while (map.explored[tempx + (20 * tempy)] == 0)
             {
                 game.teleport_to_teleporter++;
-                if (game.teleport_to_teleporter >= map.numteleporters) game.teleport_to_teleporter = 0;
+                if (game.teleport_to_teleporter >= (int) map.teleporters.size()) game.teleport_to_teleporter = 0;
                 tempx = map.teleporters[game.teleport_to_teleporter].x;
                 tempy = map.teleporters[game.teleport_to_teleporter].y;
             }
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 3ce2bce7..1b15c375 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -411,7 +411,6 @@ std::string mapclass::getglitchname(int x, int y)
 void mapclass::initmapdata()
 {
 	//Set up static map information like teleporters and shiny trinkets.
-	numteleporters = 17;
 	setteleporter(0, 0);
 	setteleporter(0, 16);
 	setteleporter(2, 4);
diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h
index e786f0b1..12103848 100644
--- a/desktop_version/src/Map.h
+++ b/desktop_version/src/Map.h
@@ -154,7 +154,7 @@ public:
     std::vector<point> teleporters;
     std::vector<point> shinytrinkets;
 
-    int numteleporters, numshinytrinkets;
+    int numshinytrinkets;
     bool showteleporters, showtargets, showtrinkets;
 
     //Roomtext
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index 6d8be084..6b3b56ec 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -2008,7 +2008,7 @@ void maprender()
             }
 
             //draw legend details
-            for (int i = 0; i < map.numteleporters; i++)
+            for (size_t i = 0; i < map.teleporters.size(); i++)
             {
                 if (map.showteleporters && map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)] > 0)
                 {
@@ -2819,7 +2819,7 @@ void teleporterrender()
     }
 
     //draw legend details
-    for (int i = 0; i < map.numteleporters; i++)
+    for (size_t i = 0; i < map.teleporters.size(); i++)
     {
         if (map.showteleporters && map.explored[map.teleporters[i].x + (20 * map.teleporters[i].y)] > 0)
         {