mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 14:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix undefined colorId for pickups

Browse source
This commit is contained in:
Sergeanur 2020-10-26 16:39:43 +02:00
parent 3bdc974ff5
commit 9a3758bfc1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/control/Pickups.cpp
View file

@ -1014,8 +1014,11 @@ CPickups::DoPickUpEffects(CEntity *entity)
float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x7FF) * DEGTORAD(360.0f / 0x800)); float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x7FF) * DEGTORAD(360.0f / 0x800));
float modifiedSin = 0.3f * (s + 1.0f); float modifiedSin = 0.3f * (s + 1.0f);
#ifdef FIX_BUGS
int16 colorId = 0;
#else
int16 colorId; int16 colorId;
#endif
bool doInnerGlow = false; bool doInnerGlow = false;
bool doOuterGlow = true; bool doOuterGlow = true;
@ -1029,7 +1032,6 @@ CPickups::DoPickUpEffects(CEntity *entity)
doInnerGlow = true; doInnerGlow = true;
doOuterGlow = false; doOuterGlow = false;
} else if (entity->GetModelIndex() == MI_PICKUP_INFO || entity->GetModelIndex() == MI_PICKUP_KILLFRENZY) { } else if (entity->GetModelIndex() == MI_PICKUP_INFO || entity->GetModelIndex() == MI_PICKUP_KILLFRENZY) {
colorId = WEAPONTYPE_TOTALWEAPONS + 2;
doInnerGlow = true; doInnerGlow = true;
doOuterGlow = false; doOuterGlow = false;
} else if (entity->GetModelIndex() == MI_PICKUP_HEALTH || entity->GetModelIndex() == MI_PICKUP_BONUS) { } else if (entity->GetModelIndex() == MI_PICKUP_HEALTH || entity->GetModelIndex() == MI_PICKUP_BONUS) {