diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-05 11:03:13 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-05 11:03:13 +0200 |
| commit | 2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4 (patch) | |
| tree | 661507c1a29d128122a6c7125aa09f00f45c9b1c /src/core | |
| parent | Japanese (diff) | |
| parent | Merge pull request #377 from Fire-Head/master (diff) | |
| download | re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.tar re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.tar.gz re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.tar.bz2 re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.tar.lz re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.tar.xz re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.tar.zst re3-2aace31b06c65dd9e4b58280cc64eaa5cd58eaf4.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, |