mirror of https://github.com/OpenRCT2/OpenRCT2.git
Remove some macros from common.h
This commit is contained in:
parent
d2db5f0f16
commit
cc89104de0
|
@ -121,26 +121,6 @@ constexpr int32_t operator"" _mph(long double speedMph)
|
||||||
|
|
||||||
using StringId = uint16_t;
|
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
|
#define abstract = 0
|
||||||
|
|
||||||
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
|
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
|
||||||
|
|
|
@ -117,7 +117,7 @@ static int32_t ScenarioIndexEntryCompareByIndex(const ScenarioIndexEntry& entryA
|
||||||
|
|
||||||
static void ScenarioHighscoreFree(ScenarioHighscoreEntry* highscore)
|
static void ScenarioHighscoreFree(ScenarioHighscoreEntry* highscore)
|
||||||
{
|
{
|
||||||
SafeDelete(highscore);
|
delete highscore;
|
||||||
}
|
}
|
||||||
|
|
||||||
class ScenarioFileIndex final : public FileIndex<ScenarioIndexEntry>
|
class ScenarioFileIndex final : public FileIndex<ScenarioIndexEntry>
|
||||||
|
|
Loading…
Reference in New Issue