diff options
| author | aap <aap@papnet.eu> | 2020-04-03 11:49:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 11:49:08 +0200 |
| commit | f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293 (patch) | |
| tree | 44f04c33f37de926b4be77138978c2a2502bc67c /src/core | |
| parent | Merge pull request #376 from Nick007J/master (diff) | |
| parent | Glass cosmetic fixes (diff) | |
| download | re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.tar re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.tar.gz re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.tar.bz2 re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.tar.lz re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.tar.xz re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.tar.zst re3-f56909d8b7df667aaf9c3dfa9bb2b4745b9f2293.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/common.h | 1 | ||||
| -rw-r--r-- | src/core/config.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/common.h b/src/core/common.h index 7b4ff4a0..b58b93af 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -215,6 +215,7 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con #define ABS(a) (((a) < 0) ? (-(a)) : (a)) #define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min))))) +#define lerp(norm, min, max) ( (norm) * ((max) - (min)) + (min) ) #define STRINGIFY(x) #x #define STR(x) STRINGIFY(x) diff --git a/src/core/config.h b/src/core/config.h index 58885e57..4d66eef5 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -94,6 +94,8 @@ enum Config { NUM_GARAGES = 32, NUM_PROJECTILES = 32, + NUM_GLASSPANES = 45, + NUM_GLASSENTITIES = 32, NUM_WATERCANNONS = 3, NUMPEDROUTES = 200, |