- fixed a few parameters

This commit is contained in:
Christoph Oelckers 2020-11-02 19:53:04 +01:00
parent eb5cd98d9a
commit 64c83d166e
2 changed files with 8 additions and 8 deletions

View file

@ -212,9 +212,9 @@ void operaterespawns_d(int low)
//
//---------------------------------------------------------------------------
void operateforcefields_d(int s, int low)
void operateforcefields_d(DDukeActor* act, int low)
{
operateforcefields_common(&hittype[s], low, { W_FORCEFIELD, W_FORCEFIELD + 1, W_FORCEFIELD + 2, BIGFORCE });
operateforcefields_common(act, low, { W_FORCEFIELD, W_FORCEFIELD + 1, W_FORCEFIELD + 2, BIGFORCE });
}
//---------------------------------------------------------------------------
@ -579,7 +579,7 @@ bool checkhitswitch_d(int snum, int ww, DDukeActor *act)
}
operateactivators(lotag, snum);
fi.operateforcefields(ps[snum].i, lotag);
fi.operateforcefields(ps[snum].GetActor(), lotag);
operatemasterswitches(lotag);
if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
@ -1533,7 +1533,7 @@ void checksectors_d(int snum)
if (chatmodeon || p->GetActor()->s.extra <= 0) return;
if (ud.cashman && PlayerInput(snum, SB_OPEN))
fi.lotsofmoney(&hittype[p->i], 2);
fi.lotsofmoney(p->GetActor(), 2);
if (p->newowner >= 0)
{

View file

@ -332,9 +332,9 @@ void operaterespawns_r(int low)
//
//---------------------------------------------------------------------------
void operateforcefields_r(int s, int low)
void operateforcefields_r(DDukeActor* act, int low)
{
operateforcefields_common(&hittype[s], low, { BIGFORCE });
operateforcefields_common(act, low, { BIGFORCE });
}
//---------------------------------------------------------------------------
@ -861,7 +861,7 @@ bool checkhitswitch_r(int snum, int ww, DDukeActor* act)
}
operateactivators(lotag, snum);
fi.operateforcefields(ps[snum].i, lotag);
fi.operateforcefields(ps[snum].GetActor(), lotag);
operatemasterswitches(lotag);
if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
@ -2477,7 +2477,7 @@ void checksectors_r(int snum)
if (chatmodeon || p->GetActor()->s.extra <= 0) return;
if (ud.cashman && PlayerInput(snum, SB_OPEN))
fi.lotsofmoney(&hittype[p->i], 2);
fi.lotsofmoney(p->GetActor(), 2);
if (!(PlayerInput(snum, SB_OPEN)))