diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-08-07 12:34:41 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-08-07 12:34:41 +0300 |
| commit | 7d8ffa9ebd32257d6aa59e27cd25a657a85613da (patch) | |
| tree | 0eff46681a3524fd86a63bc8a0eb65b3c7409b5b /src/render/Rubbish.h | |
| parent | 40185161b83091e79455acf6fe82f070e26c6662 (diff) | |
| parent | f14b1fba09fa992a67abe10ca12897fd9db386be (diff) | |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
Diffstat (limited to 'src/render/Rubbish.h')
| -rw-r--r-- | src/render/Rubbish.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/render/Rubbish.h b/src/render/Rubbish.h index 52050e20..5a4e479b 100644 --- a/src/render/Rubbish.h +++ b/src/render/Rubbish.h @@ -4,7 +4,11 @@ class CVehicle; enum { // NB: not all values are allowed, check the code +#ifdef SQUEEZE_PERFORMANCE + NUM_RUBBISH_SHEETS = 32 +#else NUM_RUBBISH_SHEETS = 64 +#endif }; class COneSheet |