Browse Source

Correct var names in StartPlrHit (#484)

* Correct var names in StartPlrHit

* Clean up RespawnDeadItem

* Update Source/player.cpp

Co-Authored-By: AJenbo <anders@jenbo.dk>
pull/25/head
Anders Jenbo 7 years ago committed by Robin Eklind
parent
commit
ef28a74db5
  1. 24
      Source/player.cpp

24
Source/player.cpp

@ -1559,6 +1559,8 @@ void __fastcall RemovePlrFromMap(int pnum)
void __fastcall StartPlrHit(int pnum, int dam, BOOL forcehit) void __fastcall StartPlrHit(int pnum, int dam, BOOL forcehit)
{ {
int pd;
if ((DWORD)pnum >= MAX_PLRS) { if ((DWORD)pnum >= MAX_PLRS) {
TermMsg("StartPlrHit: illegal player %d", pnum); TermMsg("StartPlrHit: illegal player %d", pnum);
} }
@ -1578,15 +1580,15 @@ void __fastcall StartPlrHit(int pnum, int dam, BOOL forcehit)
drawhpflag = TRUE; drawhpflag = TRUE;
if (dam >> 6 >= plr[pnum]._pLevel || forcehit) { if (dam >> 6 >= plr[pnum]._pLevel || forcehit) {
int dir = plr[pnum]._pdir; pd = plr[pnum]._pdir;
if (!(plr[pnum]._pGFXLoad & PFILE_HIT)) { if (!(plr[pnum]._pGFXLoad & PFILE_HIT)) {
LoadPlrGFX(pnum, PFILE_HIT); LoadPlrGFX(pnum, PFILE_HIT);
} }
NewPlrAnim(pnum, plr[pnum]._pHAnim[dir], plr[pnum]._pHFrames, 0, plr[pnum]._pHWidth); NewPlrAnim(pnum, plr[pnum]._pHAnim[pd], plr[pnum]._pHFrames, 0, plr[pnum]._pHWidth);
plr[pnum]._pmode = PM_GOTHIT; plr[pnum]._pmode = PM_GOTHIT;
FixPlayerLocation(pnum, dir); FixPlayerLocation(pnum, pd);
plr[pnum]._pVar8 = 1; plr[pnum]._pVar8 = 1;
FixPlrWalkTags(pnum); FixPlrWalkTags(pnum);
dPlayer[plr[pnum].WorldX][plr[pnum].WorldY] = pnum + 1; dPlayer[plr[pnum].WorldX][plr[pnum].WorldY] = pnum + 1;
@ -1596,6 +1598,8 @@ void __fastcall StartPlrHit(int pnum, int dam, BOOL forcehit)
void __fastcall RespawnDeadItem(ItemStruct *itm, int x, int y) void __fastcall RespawnDeadItem(ItemStruct *itm, int x, int y)
{ {
int ii;
if (numitems >= MAXITEMS) { if (numitems >= MAXITEMS) {
return; return;
} }
@ -1605,14 +1609,14 @@ void __fastcall RespawnDeadItem(ItemStruct *itm, int x, int y)
SyncGetItem(x, y, itm->IDidx, itm->_iCreateInfo, itm->_iSeed); SyncGetItem(x, y, itm->IDidx, itm->_iCreateInfo, itm->_iSeed);
} }
int i = itemavail[0]; ii = itemavail[0];
dItem[x][y] = i + 1; dItem[x][y] = ii + 1;
itemavail[0] = itemavail[MAXITEMS - numitems - 1]; itemavail[0] = itemavail[MAXITEMS - numitems - 1];
itemactive[numitems] = i; itemactive[numitems] = ii;
item[i] = *itm; item[ii] = *itm;
item[i]._ix = x; item[ii]._ix = x;
item[i]._iy = y; item[ii]._iy = y;
RespawnItem(i, TRUE); RespawnItem(ii, TRUE);
numitems++; numitems++;
itm->_itype = ITYPE_NONE; itm->_itype = ITYPE_NONE;
} }

Loading…
Cancel
Save