From 5b9c6a968009cdf908af6d34cc5ecf3f85100689 Mon Sep 17 00:00:00 2001 From: Misa Date: Tue, 14 Apr 2020 19:29:19 -0700 Subject: [PATCH] Remove now-unused parameter 't' from mapclass::setteleporter() This was previously used to set the indice of the teleporter, but now that we do push_back() it's no longer necessary and is now unused. --- desktop_version/src/Map.cpp | 36 ++++++++++++++++++------------------ desktop_version/src/Map.h | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 83d59f9b..3ce2bce7 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -123,7 +123,7 @@ int mapclass::intpol(int a, int b, float c) return static_cast(a + ((b - a) * c)); } -void mapclass::setteleporter(int t, int x, int y) +void mapclass::setteleporter(int x, int y) { point temp; temp.x = x; @@ -412,23 +412,23 @@ void mapclass::initmapdata() { //Set up static map information like teleporters and shiny trinkets. numteleporters = 17; - setteleporter(0, 0, 0); - setteleporter(1, 0, 16); - setteleporter(2, 2, 4); - setteleporter(3, 2, 11); - setteleporter(4, 7, 9); - setteleporter(5, 7, 15); - setteleporter(6, 8, 11); - setteleporter(7, 10, 5); - setteleporter(8, 11, 4); - setteleporter(9, 13, 2); - setteleporter(10, 13, 8); - setteleporter(11, 14, 19); - setteleporter(12, 15, 0); - setteleporter(13, 17, 12); - setteleporter(14, 17, 17); - setteleporter(15, 18, 1); - setteleporter(16, 18, 7); + setteleporter(0, 0); + setteleporter(0, 16); + setteleporter(2, 4); + setteleporter(2, 11); + setteleporter(7, 9); + setteleporter(7, 15); + setteleporter(8, 11); + setteleporter(10, 5); + setteleporter(11, 4); + setteleporter(13, 2); + setteleporter(13, 8); + setteleporter(14, 19); + setteleporter(15, 0); + setteleporter(17, 12); + setteleporter(17, 17); + setteleporter(18, 1); + setteleporter(18, 7); numshinytrinkets = 18; settrinket(0, 14, 4); diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h index 079abd3c..e786f0b1 100644 --- a/desktop_version/src/Map.h +++ b/desktop_version/src/Map.h @@ -26,7 +26,7 @@ public: int intpol(int a, int b, float c); - void setteleporter(int t, int x, int y); + void setteleporter(int x, int y); void settrinket(int t, int x, int y);