MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diasurgical/devilution

Browse source
This commit is contained in:
Anders Jenbo 2019-11-01 00:06:53 +01:00
commit 215ff59e65
16 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/objects.cpp
View file

@ -3417,7 +3417,7 @@ void OperateShrine(int pnum, int i, int sType)
}
CalcPlrInv(pnum, TRUE);
drawpanflag = 255;
force_redraw = 255;
if (pnum == myplr)
NetSendCmdParam2(FALSE, CMD_PLROPOBJ, pnum, i);
@ -3539,7 +3539,7 @@ void OperateGoatShrine(int pnum, int i, int sType)
object[i]._oVar1 = FindValidShrine(i);
OperateShrine(pnum, i, sType);
object[i]._oAnimDelay = 2;
drawpanflag = 255;
force_redraw = 255;
}
void OperateCauldron(int pnum, int i, int sType)
@ -3549,7 +3549,7 @@ void OperateCauldron(int pnum, int i, int sType)
OperateShrine(pnum, i, sType);
object[i]._oAnimFlag = 0;
object[i]._oAnimFrame = 3;
drawpanflag = 255;
force_redraw = 255;
}
BOOL OperateFountains(int pnum, int i)
@ -3667,7 +3667,7 @@ BOOL OperateFountains(int pnum, int i)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i);
break;
}
drawpanflag = 255;
force_redraw = 255;
return applied;
}