diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-13 00:19:21 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-13 00:27:15 +0300 |
| commit | 33dfaf7da11675fdad2909e39b6d15e49fc6cc68 (patch) | |
| tree | ff2b3fe079b51b521cb26ceb2da0a5717b0601ff /src/core/config.h | |
| parent | dc444b9ca06efd32eb624e5da063cfec309a086a (diff) | |
| parent | c40fcdf39ab77cb0fde26e314652e0aaf9dd4544 (diff) | |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
Diffstat (limited to 'src/core/config.h')
| -rw-r--r-- | src/core/config.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/config.h b/src/core/config.h index 17cea982..30f6b898 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -195,19 +195,22 @@ enum Config { #define FIX_BUGS // fixes bugs that we've came across during reversing, TODO: use this more #define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things #define MORE_LANGUAGES // Add more translations to the game -#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) +#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) #define USE_TXD_CDIMAGE // generate and load textures from txd.img #define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number //#define USE_TEXTURE_POOL -//#define AUDIO_OAL +#ifdef _WIN32 #define AUDIO_MSS +#else +#define AUDIO_OAL +#endif // Particle //#define PC_PARTICLE //#define PS2_ALTERNATIVE_CARSPLASH // unused on PS2 // Pad -#ifndef RW_GL3 +#if !defined(RW_GL3) && defined(_WIN32) #define XINPUT #endif #define DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m @@ -225,7 +228,7 @@ enum Config { #define SCROLLABLE_STATS_PAGE // only draggable by mouse atm #define TRIANGLE_BACK_BUTTON // #define CIRCLE_BACK_BUTTON -#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better. +#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better. #define BETA_SLIDING_TEXT // Script |