Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix party max vitals being set to 0 resulting in a divide by 0 issue. #201

Merged
merged 2 commits into from May 8, 2020
Merged

Fix party max vitals being set to 0 resulting in a divide by 0 issue. #201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef66c0
Fix a divide by zero issue causing party vitals to crash the client w…
Cheshire92 May 8, 2020
aaa91b3
Minor clean-up.
Cheshire92 May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 22 additions & 12 deletions Intersect.Client/Interface/Game/PartyWindow.cs
View file
Open in desktop
Expand Up @@ -210,19 +210,24 @@ public void Update()

if (mHpBar[i].Texture != null)
{
var vitalHp = Globals.Me.Party[i].Vital[(int) Vitals.Health];
var vitalMaxHp = Globals.Me.Party[i].MaxVital[(int) Vitals.Health];
var ratioHp = (float) vitalHp / (float) vitalMaxHp;
ratioHp = Math.Min(1, Math.Max(0, ratioHp));
var partyHpWidthRatio = 1f;
if (Globals.Me.Party[i].MaxVital[(int)Vitals.Health] > 0)
{
var vitalHp = Globals.Me.Party[i].Vital[(int)Vitals.Health];
var vitalMaxHp = Globals.Me.Party[i].MaxVital[(int)Vitals.Health];
var ratioHp = (float)vitalHp / (float)vitalMaxHp;
partyHpWidthRatio = Math.Min(1, Math.Max(0, ratioHp));
}

mHpBar[i]
.SetTextureRect(
0, 0, Convert.ToInt32(mHpBar[i].Texture.GetWidth() * ratioHp),
0, 0, Convert.ToInt32(mHpBar[i].Texture.GetWidth() * partyHpWidthRatio),
mHpBar[i].Texture.GetHeight()
);

mHpBar[i]
.SetSize(
Convert.ToInt32(ratioHp * mHpBarContainer[i].Width), mHpBarContainer[i].Height
Convert.ToInt32(partyHpWidthRatio * mHpBarContainer[i].Width), mHpBarContainer[i].Height
);
}

Expand All @@ -233,19 +238,24 @@ public void Update()

if (mMpBar[i].Texture != null)
{
var vitalMp = Globals.Me.Party[i].Vital[(int) Vitals.Mana];
var vitalMaxMp = Globals.Me.Party[i].MaxVital[(int) Vitals.Mana];
var ratioMp = (float) vitalMp / (float) vitalMaxMp;
ratioMp = Math.Min(1, Math.Max(0, ratioMp));
var partyMpWidthRatio = 1f;
if (Globals.Me.Party[i].MaxVital[(int)Vitals.Mana] > 0)
{
var vitalMp = Globals.Me.Party[i].Vital[(int)Vitals.Mana];
var vitalMaxMp = Globals.Me.Party[i].MaxVital[(int)Vitals.Mana];
var ratioMp = (float)vitalMp / (float)vitalMaxMp;
partyMpWidthRatio = Math.Min(1, Math.Max(0, ratioMp));
}

mMpBar[i]
.SetTextureRect(
0, 0, Convert.ToInt32(mMpBar[i].Texture.GetWidth() * ratioMp),
0, 0, Convert.ToInt32(mMpBar[i].Texture.GetWidth() * partyMpWidthRatio),
mMpBar[i].Texture.GetHeight()
);

mMpBar[i]
.SetSize(
Convert.ToInt32(ratioMp * mMpBarContainer[i].Width), mMpBarContainer[i].Height
Convert.ToInt32(partyMpWidthRatio * mMpBarContainer[i].Width), mMpBarContainer[i].Height
);
}

Expand Down