Fixes for melees and various things

2020-05-20 20:10:05 +03:00
parent fd4cd3e8f1
commit 2ab3fb5dd0
15 changed files with 297 additions and 196 deletions
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -399,8 +399,8 @@ CEntity::HasPreRenderEffects(void)
 	   GetModelIndex() == MI_MISSILE ||
 	   GetModelIndex() == MI_BEACHBALL ||
 	   IsGlass(GetModelIndex()) ||
-	   IsObject() && ((CObject*)this)->bIsPickup;
-	   IsStreetLight(GetModelIndex());
+	   IsObject() && ((CObject*)this)->bIsPickup ||
+	   IsLightWithPreRenderEffects(GetModelIndex());
 }

 void