Merge pull request OpenRCT2#20657 from ZehMatt/common-junk-2

Remove some macros from common.h
733737 · Jul 27, 2023 · 19118de · 19118de
2 parents d2db5f0 + cc89104
commit 19118de
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/src/openrct2/common.h b/src/openrct2/common.h
@@ -121,26 +121,6 @@ constexpr int32_t operator"" _mph(long double speedMph)
 
 using StringId = uint16_t;
 
-#define SafeFree(x)                                                                                                            \
-    do                                                                                                                         \
-    {                                                                                                                          \
-        free(x);                                                                                                               \
-        (x) = nullptr;                                                                                                         \
-    } while (false)
-
-#define SafeDelete(x)                                                                                                          \
-    do                                                                                                                         \
-    {                                                                                                                          \
-        delete (x);                                                                                                            \
-        (x) = nullptr;                                                                                                         \
-    } while (false)
-#define SafeDeleteArray(x)                                                                                                     \
-    do                                                                                                                         \
-    {                                                                                                                          \
-        delete[](x);                                                                                                           \
-        (x) = nullptr;                                                                                                         \
-    } while (false)
-
 #define abstract = 0
 
 #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))

diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp
@@ -117,7 +117,7 @@ static int32_t ScenarioIndexEntryCompareByIndex(const ScenarioIndexEntry& entryA
 
 static void ScenarioHighscoreFree(ScenarioHighscoreEntry* highscore)
 {
-    SafeDelete(highscore);
+    delete highscore;
 }
 
 class ScenarioFileIndex final : public FileIndex<ScenarioIndexEntry>