diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 23:19:25 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 23:19:25 +0200 |
| commit | 6a7bd0e3304caa331e6b095efdb7ddbeceb08293 (patch) | |
| tree | df812c11da162c563c3484e0dfe1851dd1a61e82 /src/core | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.gz re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.bz2 re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.lz re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.xz re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.zst re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Timer.h | 2 | ||||
| -rw-r--r-- | src/core/config.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/core/Timer.h b/src/core/Timer.h index 004cda4d..e7b6fec8 100644 --- a/src/core/Timer.h +++ b/src/core/Timer.h @@ -58,7 +58,7 @@ public: friend bool GenericSave(int file); #ifdef FIX_BUGS - static float GetDefaultTimeStep(void) { return 5.0f / 3.0f; } + static float GetDefaultTimeStep(void) { return 50.0f / 30.0f; } static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); } #endif }; diff --git a/src/core/config.h b/src/core/config.h index 4d1a5996..ea31a3c8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -201,11 +201,6 @@ enum Config { #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 -#ifdef _WIN32 -#define AUDIO_MSS -#else -#define AUDIO_OAL -#endif #ifdef DEBUGMENU #define RELOADABLES // some debug menu options to reload TXD files #endif |