From aed7b220c7ed8670fc0165025a74dab31ea28c2a Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 17 May 2020 16:45:57 -0700 Subject: [PATCH] Remove now-unused function mapclass::fillcontent() Previously, it was used to parse 30 strings whenever loading a room. But now it's no longer used since we just assign the tilemap to the vector directly. --- desktop_version/src/Map.cpp | 14 -------------- desktop_version/src/Map.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 26f37bb0..7191f3ea 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -745,20 +745,6 @@ void mapclass::settile(int xp, int yp, int t) } } -void mapclass::fillcontent(std::vector& tmap) -{ - - for (j = 0; j < 29+extrarow; j++) - { - std::vector maprow = split(tmap[j], ','); - - for(int i = 0; i < 40; i++) - { - contents[i + vmult[j]] = atoi(maprow[i].c_str()); - } - } -} - int mapclass::area(int _rx, int _ry) { diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h index ed41a7a1..3d90ad70 100644 --- a/desktop_version/src/Map.h +++ b/desktop_version/src/Map.h @@ -62,8 +62,6 @@ public: void settile(int xp, int yp, int t); - void fillcontent(std::vector& tmap); - int area(int _rx, int _ry);