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

♻️Use Point for positions in msg.cpp functions

Browse source
This commit is contained in:
Anders Jenbo 2021-04-29 16:02:11 +02:00
commit 5745f099ba
12 changed files with 66 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/trigs.cpp
View file

@ -825,7 +825,7 @@ void CheckTriggers()
switch (trigs[i]._tmsg) {
case WM_DIABNEXTLVL:
if (gbIsSpawn && currlevel >= 2) {
NetSendCmdLoc(myplr, true, CMD_WALKXY, plr[myplr].position.tile.x, plr[myplr].position.tile.y + 1);
NetSendCmdLoc(myplr, true, CMD_WALKXY, { plr[myplr].position.tile.x, plr[myplr].position.tile.y + 1 });
PlaySFX(PS_WARR18);
InitDiabloMsg(EMSG_NOT_IN_SHAREWARE);
} else {
@ -840,28 +840,25 @@ void CheckTriggers()
break;
case WM_DIABTOWNWARP:
if (gbIsMultiplayer) {
int x, y;
bool abort = false;
diablo_message abortflag;
auto position = plr[myplr].position.tile;
if (trigs[i]._tlvl == 5 && plr[myplr]._pLevel < 8) {
abort = true;
x = plr[myplr].position.tile.x;
y = plr[myplr].position.tile.y + 1;
position.y += 1;
abortflag = EMSG_REQUIRES_LVL_8;
}
if (trigs[i]._tlvl == 9 && plr[myplr]._pLevel < 13) {
abort = true;
x = plr[myplr].position.tile.x + 1;
y = plr[myplr].position.tile.y;
position.x += 1;
abortflag = EMSG_REQUIRES_LVL_13;
}
if (trigs[i]._tlvl == 13 && plr[myplr]._pLevel < 17) {
abort = true;
x = plr[myplr].position.tile.x;
y = plr[myplr].position.tile.y + 1;
position.y += 1;
abortflag = EMSG_REQUIRES_LVL_17;
}
@ -869,7 +866,7 @@ void CheckTriggers()
plr[myplr].PlaySpeach(43);
InitDiabloMsg(abortflag);
NetSendCmdLoc(myplr, true, CMD_WALKXY, x, y);
NetSendCmdLoc(myplr, true, CMD_WALKXY, position);
return;
}
}