Skip to content

Commit

Permalink
Fix invalid window overlay addition
Browse files Browse the repository at this point in the history
RefreshPlayerVisualGear in player.kod was trying to set a non-existent
overlay for torches, if they were used with a soldier shield. Prevented
it from doing this.
  • Loading branch information
skittles1 committed Oct 20, 2014
1 parent 00314ba commit 1213404
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions kod/object/active/holder/nomoveon/battler/player.kod
Expand Up @@ -9385,7 +9385,6 @@ messages:
return;
}


SetWindowOverlay(what = $)
"Sends a message to the client about a window overlay, and adds <what> "
"to plWindow_overlays."
Expand Down Expand Up @@ -9936,11 +9935,13 @@ messages:
Send(oSoldierShield,@SlingOnBack,#report=FALSE);
bSoldierShieldSlung = TRUE;

% Now restore the first-person view of other shield if we're using one
% Now restore the first-person view of other shield
% if we're using one
for n in plUsing
{
if (IsClass(n,&Shield)
AND NOT IsClass(n,&SoldierShield))
AND NOT IsClass(n,&SoldierShield)
AND NOT IsClass(n,&Torch))
{
Send(self,@SetWindowOverlay,#what=n);
}
Expand Down

0 comments on commit 1213404

Please sign in to comment.