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

This commit is contained in:
Anders Jenbo 2019-06-16 19:12:14 +02:00
commit e6f4e21631
79 changed files with 2110 additions and 2263 deletions

View file

@ -104,9 +104,9 @@ void GiveGoldCheat()
ni = plr[myplr]._pNumInv++;
SetPlrHandItem(&plr[myplr].InvList[ni], IDI_GOLD);
GetPlrHandSeed(&plr[myplr].InvList[ni]);
plr[myplr].InvList[ni]._ivalue = 5000;
plr[myplr].InvList[ni]._ivalue = GOLD_MAX_LIMIT;
plr[myplr].InvList[ni]._iCurs = 6;
plr[myplr]._pGold += 5000;
plr[myplr]._pGold += GOLD_MAX_LIMIT;
plr[myplr].InvGrid[i] = plr[myplr]._pNumInv;
}
}
@ -197,7 +197,7 @@ void PrintDebugPlayer(BOOL bNextPlayer)
char dstr[128];
if (bNextPlayer)
dbgplr = ((_BYTE)dbgplr + 1) & 3;
dbgplr = ((BYTE)dbgplr + 1) & 3;
sprintf(dstr, "Plr %i : Active = %i", dbgplr, plr[dbgplr].plractive);
NetSendCmdString(1 << myplr, dstr);