summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-26 15:39:43 +0100
committerSergeanur <s.anureev@yandex.ua>2020-10-26 15:39:43 +0100
commit9a3758bfc12b1e9fac279d2733b3e697747bce22 (patch)
tree15e0885e0e7f1293517f21b5dc89e7b2806f517d /src/control/Pickups.cpp
parentsmall glass fix (diff)
downloadre3-9a3758bfc12b1e9fac279d2733b3e697747bce22.tar
re3-9a3758bfc12b1e9fac279d2733b3e697747bce22.tar.gz
re3-9a3758bfc12b1e9fac279d2733b3e697747bce22.tar.bz2
re3-9a3758bfc12b1e9fac279d2733b3e697747bce22.tar.lz
re3-9a3758bfc12b1e9fac279d2733b3e697747bce22.tar.xz
re3-9a3758bfc12b1e9fac279d2733b3e697747bce22.tar.zst
re3-9a3758bfc12b1e9fac279d2733b3e697747bce22.zip
Diffstat (limited to 'src/control/Pickups.cpp')
-rw-r--r--src/control/Pickups.cpp6
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) {