From 86516bb2840551554494c7a2ec21869b9bb4fa9d Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 17 May 2020 17:02:01 -0700 Subject: [PATCH] Remove now-unused fillbackground/fillcontents/fillminitower from Tower They are now unused because we no longer have to parse 120, 100, or 700 strings in order to load these tilemaps. --- desktop_version/src/Tower.cpp | 38 ----------------------------------- desktop_version/src/Tower.h | 6 ------ 2 files changed, 44 deletions(-) diff --git a/desktop_version/src/Tower.cpp b/desktop_version/src/Tower.cpp index 5c277ba5..06ade4fd 100644 --- a/desktop_version/src/Tower.cpp +++ b/desktop_version/src/Tower.cpp @@ -104,32 +104,6 @@ int towerclass::miniat(int xp, int yp, int yoff) return 0; } -void towerclass::fillbackground(std::vector& tmap) -{ - for (int j = 0; j < 120; j++) - { - std::vector maprow = split(tmap[j], ','); - for (int i = 0; i < 40; i++) - { - back[i + vmult[j]] = atoi(maprow[i].c_str()); - } - } -} - -void towerclass::fillminitower(std::vector& tmap) -{ - - - for (int j = 0; j < 100; j++) - { - std::vector maprow = split(tmap[j], ','); - for (int i = 0; i < 40; i++) - { - minitower[i + vmult[j]] = atoi(maprow[i].c_str()); - } - } -} - void towerclass::loadminitower1() { //Loads the first minitower into the array. @@ -487,18 +461,6 @@ void towerclass::loadbackground() back.insert(back.end(), tmap, tmap + 120*40); } -void towerclass::fillcontents(std::vector& tmap) -{ - for (int j = 0; j < 700; j++) - { - std::vector maprow = split(tmap[j], ','); - for (int i = 0; i < 40; i++) - { - contents[i + vmult[j]] = atoi(maprow[i].c_str()); - } - } -} - void towerclass::loadmap() { //Loads the map into the array. diff --git a/desktop_version/src/Tower.h b/desktop_version/src/Tower.h index 0ba2cc72..ad3ff465 100644 --- a/desktop_version/src/Tower.h +++ b/desktop_version/src/Tower.h @@ -15,18 +15,12 @@ public: int miniat(int xp, int yp, int yoff); - void fillbackground(std::vector& tmap); - - void fillminitower(std::vector& tmap); - void loadminitower1(); void loadminitower2(); void loadbackground(); - void fillcontents(std::vector& tmap); - void loadmap(); //public var back:Array = new Array();