From fb9791a4c7bde277146ded2f325c8ec854ab852c Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 8 Apr 2020 22:15:18 -0700 Subject: [PATCH] Remove now-useless function editorclass::countstuff() Previously, it existed solely to count the number of trinkets and crewmates when loading a level, because we were keeping track of the amount of them manually, incrementing and decrementing every time a trinket or crewmate was added or removed, but loading a new level represented a case that could potentially not be an increment or decrement. However, since the amount tracking is now handled automatically, this function now does nothing, and can be safely removed. --- desktop_version/src/editor.cpp | 5 ----- desktop_version/src/editor.h | 1 - 2 files changed, 6 deletions(-) diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index 37fe021a..e64dc04e 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -1618,10 +1618,6 @@ int editorclass::findwarptoken(int t) return 0; } -void editorclass::countstuff() -{ -} - void editorclass::load(std::string& _path) { reset(); @@ -1846,7 +1842,6 @@ void editorclass::load(std::string& _path) } gethooks(); - countstuff(); version=2; } diff --git a/desktop_version/src/editor.h b/desktop_version/src/editor.h index 9bfc5bc3..e56bd9b3 100644 --- a/desktop_version/src/editor.h +++ b/desktop_version/src/editor.h @@ -138,7 +138,6 @@ class editorclass{ int findtrinket(int t); int findcrewmate(int t); int findwarptoken(int t); - void countstuff(); void findstartpoint(); int getlevelcol(int t); int getenemycol(int t);