diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-11-01 20:35:46 +0100 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-11-01 20:35:46 +0100 |
| commit | 55c43466100e4e79af95500f64513c49d7242877 (patch) | |
| tree | 2376e54398c53697c07bd6809b9648d561516881 /src/control/Pickups.cpp | |
| parent | Fix build and use enum in ProcessPlayerMood (diff) | |
| parent | fixed KYFC (diff) | |
| download | re3-55c43466100e4e79af95500f64513c49d7242877.tar re3-55c43466100e4e79af95500f64513c49d7242877.tar.gz re3-55c43466100e4e79af95500f64513c49d7242877.tar.bz2 re3-55c43466100e4e79af95500f64513c49d7242877.tar.lz re3-55c43466100e4e79af95500f64513c49d7242877.tar.xz re3-55c43466100e4e79af95500f64513c49d7242877.tar.zst re3-55c43466100e4e79af95500f64513c49d7242877.zip | |
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 8b8bc1a3..2a5863f1 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -1014,8 +1014,11 @@ CPickups::DoPickUpEffects(CEntity *entity) float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x7FF) * DEGTORAD(360.0f / 0x800)); float modifiedSin = 0.3f * (s + 1.0f); - +#ifdef FIX_BUGS + int16 colorId = 0; +#else int16 colorId; +#endif bool doInnerGlow = false; bool doOuterGlow = true; @@ -1029,7 +1032,6 @@ CPickups::DoPickUpEffects(CEntity *entity) doInnerGlow = true; doOuterGlow = false; } else if (entity->GetModelIndex() == MI_PICKUP_INFO || entity->GetModelIndex() == MI_PICKUP_KILLFRENZY) { - colorId = WEAPONTYPE_TOTALWEAPONS + 2; doInnerGlow = true; doOuterGlow = false; } else if (entity->GetModelIndex() == MI_PICKUP_HEALTH || entity->GetModelIndex() == MI_PICKUP_BONUS) { |