From 5745f099babe7aef0edc76a33303882c35cf8a40 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Thu, 29 Apr 2021 16:02:11 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8FUse=20Point=20for=20positions?= =?UTF-8?q?=20in=20msg.cpp=20functions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/controls/plrctrls.cpp | 10 ++++----- Source/diablo.cpp | 18 ++++++++-------- Source/interfac.cpp | 2 +- Source/inv.cpp | 8 ++++---- Source/items.cpp | 2 +- Source/missiles.cpp | 6 +++--- Source/monster.cpp | 10 ++++----- Source/msg.cpp | 40 ++++++++++++++++++------------------ Source/msg.h | 12 +++++------ Source/player.cpp | 8 ++++---- Source/track.cpp | 4 ++-- Source/trigs.cpp | 15 ++++++-------- 12 files changed, 66 insertions(+), 69 deletions(-) diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp index ffaa8cc0e..31a786372 100644 --- a/Source/controls/plrctrls.cpp +++ b/Source/controls/plrctrls.cpp @@ -442,7 +442,7 @@ void FindTrigger() void Interact() { if (leveltype == DTYPE_TOWN && pcursmonst != -1) { - NetSendCmdLocParam1(true, CMD_TALKXY, towners[pcursmonst].position.x, towners[pcursmonst].position.y, pcursmonst); + NetSendCmdLocParam1(true, CMD_TALKXY, towners[pcursmonst].position, pcursmonst); } else if (pcursmonst != -1) { if (plr[myplr]._pwtype != WT_RANGED || CanTalkToMonst(pcursmonst)) { NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); @@ -817,7 +817,7 @@ void WalkInDir(int playerId, AxisDirection dir) if (dir.x == AxisDirectionX_NONE && dir.y == AxisDirectionY_NONE) { if (sgbControllerActive && plr[playerId].walkpath[0] != WALK_NONE && plr[playerId].destAction == ACTION_NONE) - NetSendCmdLoc(playerId, true, CMD_WALKXY, x, y); // Stop walking + NetSendCmdLoc(playerId, true, CMD_WALKXY, { x, y }); // Stop walking return; } @@ -829,7 +829,7 @@ void WalkInDir(int playerId, AxisDirection dir) if (PosOkPlayer(playerId, dx, dy) && IsPathBlocked(x, y, pdir)) return; // Don't start backtrack around obstacles - NetSendCmdLoc(playerId, true, CMD_WALKXY, dx, dy); + NetSendCmdLoc(playerId, true, CMD_WALKXY, { dx, dy }); } void QuestLogMove(AxisDirection moveDir) @@ -1238,9 +1238,9 @@ void PerformSecondaryAction() NewCursor(CURSOR_HAND); if (pcursitem != -1) { - NetSendCmdLocParam1(true, CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); + NetSendCmdLocParam1(true, CMD_GOTOAGETITEM, { cursmx, cursmy }, pcursitem); } else if (pcursobj != -1) { - NetSendCmdLocParam1(true, CMD_OPOBJXY, cursmx, cursmy, pcursobj); + NetSendCmdLocParam1(true, CMD_OPOBJXY, { cursmx, cursmy }, pcursobj); } else if (pcursmissile != -1) { MakePlrPath(myplr, missile[pcursmissile].position.tile.x, missile[pcursmissile].position.tile.y, true); plr[myplr].destAction = ACTION_WALK; diff --git a/Source/diablo.cpp b/Source/diablo.cpp index a06862941..eba526d8e 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -749,20 +749,20 @@ static bool LeftMouseCmd(bool bShift) if (leveltype == DTYPE_TOWN) { if (pcursitem != -1 && pcurs == CURSOR_HAND) - NetSendCmdLocParam1(true, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); + NetSendCmdLocParam1(true, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, { cursmx, cursmy }, pcursitem); if (pcursmonst != -1) - NetSendCmdLocParam1(true, CMD_TALKXY, cursmx, cursmy, pcursmonst); + NetSendCmdLocParam1(true, CMD_TALKXY, { cursmx, cursmy }, pcursmonst); if (pcursitem == -1 && pcursmonst == -1 && pcursplr == -1) return true; } else { bNear = abs(plr[myplr].position.tile.x - cursmx) < 2 && abs(plr[myplr].position.tile.y - cursmy) < 2; if (pcursitem != -1 && pcurs == CURSOR_HAND && !bShift) { - NetSendCmdLocParam1(true, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); + NetSendCmdLocParam1(true, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, { cursmx, cursmy }, pcursitem); } else if (pcursobj != -1 && (!objectIsDisabled(pcursobj)) && (!bShift || (bNear && object[pcursobj]._oBreak == 1))) { - NetSendCmdLocParam1(true, pcurs == CURSOR_DISARM ? CMD_DISARMXY : CMD_OPOBJXY, cursmx, cursmy, pcursobj); + NetSendCmdLocParam1(true, pcurs == CURSOR_DISARM ? CMD_DISARMXY : CMD_OPOBJXY, { cursmx, cursmy }, pcursobj); } else if (plr[myplr]._pwtype == WT_RANGED) { if (bShift) { - NetSendCmdLoc(myplr, true, CMD_RATTACKXY, cursmx, cursmy); + NetSendCmdLoc(myplr, true, CMD_RATTACKXY, { cursmx, cursmy }); } else if (pcursmonst != -1) { if (CanTalkToMonst(pcursmonst)) { NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); @@ -778,10 +778,10 @@ static bool LeftMouseCmd(bool bShift) if (CanTalkToMonst(pcursmonst)) { NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); } else { - NetSendCmdLoc(myplr, true, CMD_SATTACKXY, cursmx, cursmy); + NetSendCmdLoc(myplr, true, CMD_SATTACKXY, { cursmx, cursmy }); } } else { - NetSendCmdLoc(myplr, true, CMD_SATTACKXY, cursmx, cursmy); + NetSendCmdLoc(myplr, true, CMD_SATTACKXY, { cursmx, cursmy }); } } else if (pcursmonst != -1) { NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); @@ -851,7 +851,7 @@ bool TryIconCurs() else if (pcursplr != -1) NetSendCmdParam3(true, CMD_TSPELLPID, pcursplr, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); else - NetSendCmdLocParam2(true, CMD_TSPELLXY, cursmx, cursmy, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); + NetSendCmdLocParam2(true, CMD_TSPELLXY, { cursmx, cursmy }, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); NewCursor(CURSOR_HAND); return true; } @@ -916,7 +916,7 @@ static bool LeftMouseDown(int wParam) CheckSBook(); } else if (pcurs >= CURSOR_FIRSTITEM) { if (TryInvPut()) { - NetSendCmdPItem(true, CMD_PUTITEM, cursmx, cursmy); + NetSendCmdPItem(true, CMD_PUTITEM, { cursmx, cursmy }); NewCursor(CURSOR_HAND); } } else { diff --git a/Source/interfac.cpp b/Source/interfac.cpp index 4074c83e8..b71abc8e9 100644 --- a/Source/interfac.cpp +++ b/Source/interfac.cpp @@ -385,7 +385,7 @@ void ShowProgress(interface_mode uMsg) saveProc = SetWindowProc(saveProc); assert(saveProc == DisableInputWndProc); - NetSendCmdLocParam1(true, CMD_PLAYER_JOINLEVEL, plr[myplr].position.tile.x, plr[myplr].position.tile.y, plr[myplr].plrlevel); + NetSendCmdLocParam1(true, CMD_PLAYER_JOINLEVEL, plr[myplr].position.tile, plr[myplr].plrlevel); plrmsg_delay(false); ResetPal(); diff --git a/Source/inv.cpp b/Source/inv.cpp index 1a81be10c..395cfb7e8 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -1716,7 +1716,7 @@ void InvGetItem(int pnum, ItemStruct *item, int ii) return; if (myplr == pnum && pcurs >= CURSOR_FIRSTITEM) - NetSendCmdPItem(true, CMD_SYNCPUTITEM, plr[myplr].position.tile.x, plr[myplr].position.tile.y); + NetSendCmdPItem(true, CMD_SYNCPUTITEM, plr[myplr].position.tile); item->_iCreateInfo &= ~CF_PREGEN; plr[pnum].HoldItem = *item; @@ -1780,7 +1780,7 @@ void AutoGetItem(int pnum, ItemStruct *item, int ii) } plr[pnum].HoldItem = *item; RespawnItem(item, true); - NetSendCmdPItem(true, CMD_RESPAWNITEM, item->position.x, item->position.y); + NetSendCmdPItem(true, CMD_RESPAWNITEM, item->position); plr[pnum].HoldItem._itype = ITYPE_NONE; } @@ -1959,7 +1959,7 @@ int InvPutItem(int pnum, int x, int y) int yp = cursmy; int xp = cursmx; if (plr[pnum].HoldItem._iCurs == ICURS_RUNE_BOMB && xp >= 79 && xp <= 82 && yp >= 61 && yp <= 64) { - NetSendCmdLocParam2(false, CMD_OPENHIVE, plr[pnum].position.tile.x, plr[pnum].position.tile.y, xx, yy); + NetSendCmdLocParam2(false, CMD_OPENHIVE, plr[pnum].position.tile, xx, yy); quests[Q_FARMER]._qactive = QUEST_DONE; if (gbIsMultiplayer) { NetSendCmdQuest(true, Q_FARMER); @@ -2356,7 +2356,7 @@ int CalculateGold(int pnum) bool DropItemBeforeTrig() { if (TryInvPut()) { - NetSendCmdPItem(true, CMD_PUTITEM, cursmx, cursmy); + NetSendCmdPItem(true, CMD_PUTITEM, { cursmx, cursmy }); NewCursor(CURSOR_HAND); return true; } diff --git a/Source/items.cpp b/Source/items.cpp index 316e6aca8..5d0b69833 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -4087,7 +4087,7 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) plr[p].destParam1 = cursmx; plr[p].destParam2 = cursmy; if (p == myplr && spl == SPL_NOVA) - NetSendCmdLoc(myplr, true, CMD_NOVA, cursmx, cursmy); + NetSendCmdLoc(myplr, true, CMD_NOVA, { cursmx, cursmy }); } break; case IMISC_SCROLLT: diff --git a/Source/missiles.cpp b/Source/missiles.cpp index d9663c529..4291a9d70 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -2331,9 +2331,9 @@ void AddTown(int mi, int sx, int sy, int dx, int dy, int midir, int8_t mienemy, PutMissile(mi); if (id == myplr && !missile[mi]._miDelFlag && currlevel != 0) { if (!setlevel) { - NetSendCmdLocParam3(true, CMD_ACTIVATEPORTAL, tx, ty, currlevel, leveltype, 0); + NetSendCmdLocParam3(true, CMD_ACTIVATEPORTAL, { tx, ty }, currlevel, leveltype, 0); } else { - NetSendCmdLocParam3(true, CMD_ACTIVATEPORTAL, tx, ty, setlvlnum, leveltype, 1); + NetSendCmdLocParam3(true, CMD_ACTIVATEPORTAL, { tx, ty }, setlvlnum, leveltype, 1); } } } @@ -2963,7 +2963,7 @@ void AddDisarm(int mi, int sx, int sy, int dx, int dy, int midir, int8_t mienemy NewCursor(CURSOR_DISARM); if (sgbControllerActive) { if (pcursobj != -1) - NetSendCmdLocParam1(true, CMD_DISARMXY, cursmx, cursmy, pcursobj); + NetSendCmdLocParam1(true, CMD_DISARMXY, { cursmx, cursmy }, pcursobj); else NewCursor(CURSOR_HAND); } diff --git a/Source/monster.cpp b/Source/monster.cpp index 0d3364628..e05ce195c 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -1792,8 +1792,8 @@ void M2MStartKill(int i, int mid) assurance((DWORD)mid < MAXMONSTERS, mid); assurance(monster[mid].MType != nullptr, mid); /// BUGFIX: should check `mid` (fixed) - delta_kill_monster(mid, monster[mid].position.tile.x, monster[mid].position.tile.y, currlevel); - NetSendCmdLocParam1(false, CMD_MONSTDEATH, monster[mid].position.tile.x, monster[mid].position.tile.y, mid); + delta_kill_monster(mid, monster[mid].position.tile, currlevel); + NetSendCmdLocParam1(false, CMD_MONSTDEATH, monster[mid].position.tile, mid); if (i < MAX_PLRS) { monster[mid].mWhoHit |= 1 << i; @@ -1838,11 +1838,11 @@ void M_StartKill(int i, int pnum) assurance((DWORD)i < MAXMONSTERS, i); if (myplr == pnum) { - delta_kill_monster(i, monster[i].position.tile.x, monster[i].position.tile.y, currlevel); + delta_kill_monster(i, monster[i].position.tile, currlevel); if (i != pnum) { - NetSendCmdLocParam1(false, CMD_MONSTDEATH, monster[i].position.tile.x, monster[i].position.tile.y, i); + NetSendCmdLocParam1(false, CMD_MONSTDEATH, monster[i].position.tile, i); } else { - NetSendCmdLocParam1(false, CMD_KILLGOLEM, monster[i].position.tile.x, monster[i].position.tile.y, currlevel); + NetSendCmdLocParam1(false, CMD_KILLGOLEM, monster[i].position.tile, currlevel); } } diff --git a/Source/msg.cpp b/Source/msg.cpp index 880ff1970..d5c9401a5 100644 --- a/Source/msg.cpp +++ b/Source/msg.cpp @@ -438,15 +438,15 @@ void delta_init() deltaload = false; } -void delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel) +void delta_kill_monster(int mi, Point position, BYTE bLevel) { if (!gbIsMultiplayer) return; sgbDeltaChanged = true; DMonsterStr *pD = &sgLevels[bLevel].monster[mi]; - pD->_mx = x; - pD->_my = y; + pD->_mx = position.x; + pD->_my = position.y; pD->_mdir = monster[mi]._mdir; pD->_mhitpoints = 0; } @@ -870,26 +870,26 @@ void NetSendCmdGolem(BYTE mx, BYTE my, direction dir, BYTE menemy, int hp, BYTE NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd)); } -void NetSendCmdLoc(int playerId, bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y) +void NetSendCmdLoc(int playerId, bool bHiPri, _cmd_id bCmd, Point position) { TCmdLoc cmd; cmd.bCmd = bCmd; - cmd.x = x; - cmd.y = y; + cmd.x = position.x; + cmd.y = position.y; if (bHiPri) NetSendHiPri(playerId, (BYTE *)&cmd, sizeof(cmd)); else NetSendLoPri(playerId, (BYTE *)&cmd, sizeof(cmd)); } -void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1) +void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1) { TCmdLocParam1 cmd; cmd.bCmd = bCmd; - cmd.x = x; - cmd.y = y; + cmd.x = position.x; + cmd.y = position.y; cmd.wParam1 = wParam1; if (bHiPri) NetSendHiPri(myplr, (BYTE *)&cmd, sizeof(cmd)); @@ -897,13 +897,13 @@ void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1 NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd)); } -void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2) +void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2) { TCmdLocParam2 cmd; cmd.bCmd = bCmd; - cmd.x = x; - cmd.y = y; + cmd.x = position.x; + cmd.y = position.y; cmd.wParam1 = wParam1; cmd.wParam2 = wParam2; if (bHiPri) @@ -912,13 +912,13 @@ void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1 NetSendLoPri(myplr, (BYTE *)&cmd, sizeof(cmd)); } -void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3) +void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2, WORD wParam3) { TCmdLocParam3 cmd; cmd.bCmd = bCmd; - cmd.x = x; - cmd.y = y; + cmd.x = position.x; + cmd.y = position.y; cmd.wParam1 = wParam1; cmd.wParam2 = wParam2; cmd.wParam3 = wParam3; @@ -1085,13 +1085,13 @@ void NetSendCmdExtra(TCmdGItem *p) NetSendHiPri(myplr, (BYTE *)&cmd, sizeof(cmd)); } -void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y) +void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, Point position) { TCmdPItem cmd; cmd.bCmd = bCmd; - cmd.x = x; - cmd.y = y; + cmd.x = position.x; + cmd.y = position.y; cmd.wIndx = plr[myplr].HoldItem.IDidx; if (plr[myplr].HoldItem.IDidx == IDI_EAR) { @@ -1971,7 +1971,7 @@ static DWORD On_MONSTDEATH(TCmd *pCmd, int pnum) else if (pnum != myplr) { if (currlevel == plr[pnum].plrlevel) M_SyncStartKill(p->wParam1, p->x, p->y, pnum); - delta_kill_monster(p->wParam1, p->x, p->y, plr[pnum].plrlevel); + delta_kill_monster(p->wParam1, { p->x, p->y }, plr[pnum].plrlevel); } return sizeof(*p); @@ -1986,7 +1986,7 @@ static DWORD On_KILLGOLEM(TCmd *pCmd, int pnum) else if (pnum != myplr) { if (currlevel == p->wParam1) M_SyncStartKill(pnum, p->x, p->y, pnum); - delta_kill_monster(pnum, p->x, p->y, plr[pnum].plrlevel); + delta_kill_monster(pnum, { p->x, p->y }, plr[pnum].plrlevel); } return sizeof(*p); diff --git a/Source/msg.h b/Source/msg.h index 116ffc520..e41e5c4ea 100644 --- a/Source/msg.h +++ b/Source/msg.h @@ -424,7 +424,7 @@ bool msg_wait_resync(); void run_delta_info(); void DeltaExportData(int pnum); void delta_init(); -void delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel); +void delta_kill_monster(int mi, Point position, BYTE bLevel); void delta_monster_hp(int mi, int hp, BYTE bLevel); void delta_sync_monster(const TSyncMonster *pSync, BYTE bLevel); bool delta_portal_inited(int i); @@ -434,16 +434,16 @@ void DeltaSaveLevel(); void DeltaLoadLevel(); void NetSendCmd(bool bHiPri, _cmd_id bCmd); void NetSendCmdGolem(BYTE mx, BYTE my, direction dir, BYTE menemy, int hp, BYTE cl); -void NetSendCmdLoc(int playerId, bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y); -void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1); -void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2); -void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y, WORD wParam1, WORD wParam2, WORD wParam3); +void NetSendCmdLoc(int playerId, bool bHiPri, _cmd_id bCmd, Point position); +void NetSendCmdLocParam1(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1); +void NetSendCmdLocParam2(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2); +void NetSendCmdLocParam3(bool bHiPri, _cmd_id bCmd, Point position, WORD wParam1, WORD wParam2, WORD wParam3); void NetSendCmdParam1(bool bHiPri, _cmd_id bCmd, WORD wParam1); void NetSendCmdParam2(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2); void NetSendCmdParam3(bool bHiPri, _cmd_id bCmd, WORD wParam1, WORD wParam2, WORD wParam3); void NetSendCmdQuest(bool bHiPri, BYTE q); void NetSendCmdGItem(bool bHiPri, _cmd_id bCmd, BYTE mast, BYTE pnum, BYTE ii); -void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, BYTE x, BYTE y); +void NetSendCmdPItem(bool bHiPri, _cmd_id bCmd, Point position); void NetSendCmdChItem(bool bHiPri, BYTE bLoc); void NetSendCmdDelItem(bool bHiPri, BYTE bLoc); void NetSendCmdDItem(bool bHiPri, int ii); diff --git a/Source/player.cpp b/Source/player.cpp index 868a6dc5a..53ea5090c 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -1720,7 +1720,7 @@ static void PlrDeadItem(int pnum, ItemStruct *itm, int xx, int yy) if ((xx || yy) && ItemSpaceOk(x, y)) { RespawnDeadItem(itm, x, y); plr[pnum].HoldItem = *itm; - NetSendCmdPItem(false, CMD_RESPAWNITEM, x, y); + NetSendCmdPItem(false, CMD_RESPAWNITEM, { x, y }); return; } @@ -1732,7 +1732,7 @@ static void PlrDeadItem(int pnum, ItemStruct *itm, int xx, int yy) if (ItemSpaceOk(x, y)) { RespawnDeadItem(itm, x, y); plr[pnum].HoldItem = *itm; - NetSendCmdPItem(false, CMD_RESPAWNITEM, x, y); + NetSendCmdPItem(false, CMD_RESPAWNITEM, { x, y }); return; } } @@ -3815,7 +3815,7 @@ void CheckPlrSpell() if (plr[myplr]._pRSpell == SPL_FIREWALL || plr[myplr]._pRSpell == SPL_LIGHTWALL) { direction sd = GetDirection(plr[myplr].position.tile, { cursmx, cursmy }); sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); - NetSendCmdLocParam3(true, CMD_SPELLXYD, cursmx, cursmy, plr[myplr]._pRSpell, sd, sl); + NetSendCmdLocParam3(true, CMD_SPELLXYD, { cursmx, cursmy }, plr[myplr]._pRSpell, sd, sl); } else if (pcursmonst != -1) { sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); NetSendCmdParam3(true, CMD_SPELLID, pcursmonst, plr[myplr]._pRSpell, sl); @@ -3824,7 +3824,7 @@ void CheckPlrSpell() NetSendCmdParam3(true, CMD_SPELLPID, pcursplr, plr[myplr]._pRSpell, sl); } else { //145 sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); - NetSendCmdLocParam2(true, CMD_SPELLXY, cursmx, cursmy, plr[myplr]._pRSpell, sl); + NetSendCmdLocParam2(true, CMD_SPELLXY, { cursmx, cursmy }, plr[myplr]._pRSpell, sl); } return; } diff --git a/Source/track.cpp b/Source/track.cpp index 6da7e5cc9..d74356267 100644 --- a/Source/track.cpp +++ b/Source/track.cpp @@ -34,7 +34,7 @@ void track_process() Uint32 tick = SDL_GetTicks(); if ((int)(tick - sgdwLastWalk) >= gnTickDelay * 6) { sgdwLastWalk = tick; - NetSendCmdLoc(myplr, true, CMD_WALKXY, cursmx, cursmy); + NetSendCmdLoc(myplr, true, CMD_WALKXY, { cursmx, cursmy }); if (!sgbIsScrolling) sgbIsScrolling = true; } @@ -50,7 +50,7 @@ void track_repeat_walk(bool rep) if (rep) { sgbIsScrolling = false; sgdwLastWalk = SDL_GetTicks() - gnTickDelay; - NetSendCmdLoc(myplr, true, CMD_WALKXY, cursmx, cursmy); + NetSendCmdLoc(myplr, true, CMD_WALKXY, { cursmx, cursmy }); } else if (sgbIsScrolling) { sgbIsScrolling = false; } diff --git a/Source/trigs.cpp b/Source/trigs.cpp index 3848bb905..f1c922130 100644 --- a/Source/trigs.cpp +++ b/Source/trigs.cpp @@ -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; } }