diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 16:04:25 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 16:04:25 +0300 |
| commit | 4141caa4d6e078fe1abbf87d8ab011c7c0705ffa (patch) | |
| tree | 03b52846a966f00edf3a818da81eb0fb67c71372 /src/core/config.h | |
| parent | ec22576e49cbf1128c61e2bbeae44c07b26e0b8b (diff) | |
| parent | 0a2df3ca4c8daa180c75684fe54a3e04fb30ff8c (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/core/Radar.cpp
# src/core/config.h
Diffstat (limited to 'src/core/config.h')
| -rw-r--r-- | src/core/config.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/config.h b/src/core/config.h index 4e30902e..7e1e65d5 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -181,6 +181,7 @@ enum Config { # define VU_COLLISION # define PS2_MENU #elif defined GTA_PC +# define EXTERNAL_3D_SOUND # define PC_PLAYER_CONTROLS // mouse player/cam mode //# define GTA_REPLAY # define GTA_SCENE_EDIT @@ -439,6 +440,8 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually #define FREE_CAM // Rotating cam // Audio +#define EXTERNAL_3D_SOUND // use external engine to simulate 3d audio spatialization. OpenAL would not work without it (because it works in a 3d space + // originally and making it work in 2d only requires more resource). Will not work on PS2 #define RADIO_SCROLL_TO_PREV_STATION // Won't work without FIX_BUGS //#define AUDIO_CACHE // cache sound lengths to speed up the cold boot #define PS2_AUDIO_CHANNELS // increases the maximum number of audio channels to PS2 value of 41 (PSP and mobile have 21 originally) @@ -481,3 +484,10 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually #endif #endif // VANILLA_DEFINES + +#if defined(AUDIO_OAL) && !defined(EXTERNAL_3D_SOUND) +#error AUDIO_OAL cannot work without EXTERNAL_3D_SOUND +#endif +#if defined(GTA_PS2) && defined(EXTERNAL_3D_SOUND) +#error EXTERNAL_3D_SOUND cannot work on PS2 +#endif |