Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/audio/AudioManager.cpp
#	src/core/Radar.cpp
This commit is contained in:
Sergeanur
2021-08-29 08:58:54 +03:00
8 changed files with 79 additions and 60 deletions

View File

@@ -821,7 +821,9 @@ public:
void RestorePreviousObjective(void);
void SetIdle(void);
#ifdef _MSC_VER
#if _MSC_VER >= 1920 && _MSC_VER < 1929
__declspec(noinline) // workaround for a compiler bug, hooray MS :P
#endif
#endif
void SetObjective(eObjective, void*);
void SetObjective(eObjective);