Browse Source

cleanup

pull/2283/head
qndel 5 years ago committed by Anders Jenbo
parent
commit
f1b85a5cd3
  1. 4
      Source/missiles.cpp
  2. 2
      Source/monster.cpp
  3. 2
      Source/objects.cpp

4
Source/missiles.cpp

@ -3070,7 +3070,7 @@ void AddGolem(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy, i
missile[mi]._miVar2 = sy;
missile[mi]._miVar4 = dx;
missile[mi]._miVar5 = dy;
if ((monster[id]._mx != 1 || monster[id]._my) && id == myplr)
if ((monster[id]._mx != 1 || monster[id]._my != 0) && id == myplr)
M_StartKill(id, id);
UseMana(id, SPL_GOLEM);
}
@ -3690,7 +3690,7 @@ void MI_Golem(int i)
char *ct;
src = missile[i]._misource;
if (monster[src]._mx == 1 && !monster[src]._my) {
if (monster[src]._mx == 1 && monster[src]._my == 0) {
for (l = 0; l < 6; l++) {
k = CrawlNum[l];
tid = k + 2;

2
Source/monster.cpp

@ -3420,7 +3420,7 @@ BOOL M_DoStone(int i)
app_fatal("M_DoStone: Invalid monster %d", i);
#endif
if (!monster[i]._mhitpoints) {
if (monster[i]._mhitpoints == 0) {
dMonster[monster[i]._mx][monster[i]._my] = 0;
monster[i]._mDelFlag = TRUE;
}

2
Source/objects.cpp

@ -4319,7 +4319,7 @@ void OperateBookCase(int pnum, int i, DIABOOL sendmsg)
if (QuestStatus(Q_ZHAR)
&& monster[MAX_PLRS].mName == UniqMonst[UMT_ZHAR].mName
&& monster[MAX_PLRS]._msquelch == UCHAR_MAX
&& monster[MAX_PLRS]._mhitpoints) {
&& monster[MAX_PLRS]._mhitpoints != 0) {
monster[MAX_PLRS].mtalkmsg = TEXT_ZHAR2;
M_StartStand(0, monster[MAX_PLRS]._mdir); // BUGFIX: first parameter in call to M_StartStand should be MAX_PLRS, not 0.
monster[MAX_PLRS]._mgoal = MGOAL_ATTACK2;

Loading…
Cancel
Save