Merge pull request #1 from FreebaseJosh/master

Quick Fix for Forrests' Damage Popup System
This commit is contained in:
Forrest Keller 2017-10-20 20:27:13 -05:00 committed by GitHub
commit 43186c5e28

View File

@ -26,7 +26,7 @@ var transient array<FKillMessageType> KillMessages;
var int HealthBarFullVisDist, HealthBarCutoffDist; var int HealthBarFullVisDist, HealthBarCutoffDist;
var transient float BestPetXL, BestPetYL; var transient float BestPetXL, BestPetYL;
struct DamageInfo struct PopupDamageInfo
{ {
var int Damage; var int Damage;
var float HitTime; var float HitTime;
@ -36,7 +36,7 @@ struct DamageInfo
var color FontColor; var color FontColor;
}; };
const DAMAGEPOPUP_COUNT = 32; const DAMAGEPOPUP_COUNT = 32;
var DamageInfo DamagePopups[32]; var PopupDamageInfo DamagePopups[32];
var int NextDamagePopupIndex; var int NextDamagePopupIndex;
var float DamagePopupFadeOutTime; var float DamagePopupFadeOutTime;
@ -1104,4 +1104,4 @@ defaultproperties
DamagePopupFadeOutTime=3.000000 DamagePopupFadeOutTime=3.000000
BadConnectionStr="Warning: Connection problem!" BadConnectionStr="Warning: Connection problem!"
} }