diff options
| author | aap <aap@papnet.eu> | 2019-08-02 23:09:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 23:09:37 +0200 |
| commit | a890a8a3b45c74c1e29bb4c9aba650752c39c5d9 (patch) | |
| tree | d41bb0d3b3f434ff8d4d3e4f12746451ae03083b /src/core | |
| parent | some CPed cleanup (diff) | |
| parent | Merge branch 'master' of github.com:Fire-Head/re3 (diff) | |
| download | re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.gz re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.bz2 re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.lz re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.xz re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.zst re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Timer.h | 1 | ||||
| -rw-r--r-- | src/core/common.h | 1 | ||||
| -rw-r--r-- | src/core/config.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/core/Timer.h b/src/core/Timer.h index 9e6d447e..8f3b77c2 100644 --- a/src/core/Timer.h +++ b/src/core/Timer.h @@ -35,6 +35,7 @@ public: static bool GetIsPaused() { return m_UserPause || m_CodePause; } static bool GetIsUserPaused() { return m_UserPause; } + static bool GetIsCodePaused() { return m_CodePause; } static void SetCodePause(bool pause) { m_CodePause = pause; } static void Initialise(void); diff --git a/src/core/common.h b/src/core/common.h index 9a5683c6..97a25a3f 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -180,6 +180,7 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con #define max(a, b) (((a) > (b)) ? (a) : (b)) #define min(a, b) (((a) < (b)) ? (a) : (b)) #define ABS(a) (((a) < 0) ? (-a) : (a)) +#define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min))))) #define STRINGIFY(x) #x diff --git a/src/core/config.h b/src/core/config.h index 85d79a01..52d1dab8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -93,6 +93,7 @@ enum Config { # define RANDOMSPLASH #elif defined GTA_PC # define GTA3_1_1_PATCH +//# define GTA3_STEAM_PATCH # ifdef GTA_PS2_STUFF //# define USE_PS2_RAND // this is unsafe until we have the game reversed # define RANDOMSPLASH // use random splash as on PS2 @@ -114,6 +115,7 @@ enum Config { // not in any game # define NASTY_GAME // nasty game for all languages # define NO_MOVIES // disable intro videos +# define NO_CDCHECK # define CHATTYSPLASH // print what the game is loading #endif |