From 0b7fca12afb93941a461fc63f67d3f4dba97cec4 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Thu, 19 Sep 2019 01:53:29 +0200 Subject: [PATCH 1/6] multi: use sizeof(sgGameInitInfo) for initdatabytes --- Source/multi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/multi.cpp b/Source/multi.cpp index 113539136..543650360 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -690,7 +690,7 @@ BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram) ProgramData.versionid = 42; ProgramData.maxplayers = MAX_PLRS; ProgramData.initdata = &sgGameInitInfo; - ProgramData.initdatabytes = 8; + ProgramData.initdatabytes = sizeof(sgGameInitInfo); ProgramData.optcategorybits = 15; ProgramData.lcid = 1033; /* LANG_ENGLISH */ memset(&plrdata, 0, sizeof(plrdata)); From 4940163d0e0842c74c0d8b4d384d95613b450992 Mon Sep 17 00:00:00 2001 From: qndel Date: Fri, 20 Sep 2019 04:26:21 +0200 Subject: [PATCH 2/6] AddTeleport cleanup --- Source/missiles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 73c75e7b6..839a206fb 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -1372,12 +1372,12 @@ void AddTeleport(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy tx = dx + CrawlTable[pn - 1]; ty = dy + CrawlTable[pn]; if (0 < tx && tx < MAXDUNX && 0 < ty && ty < MAXDUNY) { - if (!(dMonster[tx][ty] | dObject[tx][ty] | dPlayer[tx][ty] | nSolidTable[dPiece[tx][ty]])) { - missile[mi]._miDelFlag = FALSE; + if (!(nSolidTable[dPiece[tx][ty]] | dMonster[tx][ty] | dObject[tx][ty] | dPlayer[tx][ty])) { missile[mi]._mix = tx; missile[mi]._miy = ty; missile[mi]._misx = tx; missile[mi]._misy = ty; + missile[mi]._miDelFlag = FALSE; i = 6; break; } From bba1ab1da9223c31c0fa6a80b785b812b5cec91e Mon Sep 17 00:00:00 2001 From: qndel Date: Fri, 20 Sep 2019 04:06:48 +0200 Subject: [PATCH 3/6] AddResurrectBeam cleanup --- Source/missiles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 839a206fb..787b93fa8 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -2342,8 +2342,8 @@ void AddResurrectBeam(int mi, int sx, int sy, int dx, int dy, int midir, char mi { missile[mi]._mix = dx; missile[mi]._miy = dy; - missile[mi]._misx = dx; - missile[mi]._misy = dy; + missile[mi]._misx = missile[mi]._mix; + missile[mi]._misy = missile[mi]._miy; missile[mi]._mixvel = 0; missile[mi]._miyvel = 0; missile[mi]._mirange = misfiledata[36].mAnimLen[0]; From 880a5d6b7207b997c5f756a2a07c32acffcefb49 Mon Sep 17 00:00:00 2001 From: qndel Date: Fri, 20 Sep 2019 14:38:06 +0200 Subject: [PATCH 4/6] AddStone cleanup --- Source/missiles.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 787b93fa8..c0aa76a67 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -1924,10 +1924,9 @@ void AddStone(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy, i } else { missile[mi]._mix = tx; missile[mi]._miy = ty; - missile[mi]._misx = tx; - missile[mi]._misy = ty; - missile[mi]._mirange = 6; - missile[mi]._mirange += missile[mi]._mispllvl; + missile[mi]._misx = missile[mi]._mix; + missile[mi]._misy = missile[mi]._miy; + missile[mi]._mirange = missile[mi]._mispllvl + 6; missile[mi]._mirange += (missile[mi]._mirange * plr[id]._pISplDur) >> 7; if (missile[mi]._mirange > 15) From 4b0ffef7813b8d9ff56a283b0c5b20d89ff5cccc Mon Sep 17 00:00:00 2001 From: qndel Date: Fri, 20 Sep 2019 14:42:34 +0200 Subject: [PATCH 5/6] AddRhino cleanup --- Source/missiles.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index c0aa76a67..7cf64f376 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -1777,8 +1777,8 @@ void AddRhino(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy, i anim = &monster[id].MType->Anims[MA_SPECIAL]; } GetMissileVel(mi, sx, sy, dx, dy, 18); - missile[mi]._miAnimFlags = 0; missile[mi]._mimfnum = midir; + missile[mi]._miAnimFlags = 0; missile[mi]._miAnimData = anim->Data[midir]; missile[mi]._miAnimDelay = anim->Rate; missile[mi]._miAnimLen = anim->Frames; From 76eb0a3d68dd3a42a6b1b00f1e230b353446a634 Mon Sep 17 00:00:00 2001 From: qndel Date: Fri, 20 Sep 2019 16:00:34 +0200 Subject: [PATCH 6/6] MI_Firewall cleanup --- Source/missiles.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 7cf64f376..77c68f24b 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -2799,8 +2799,8 @@ void MI_Firewall(int i) } if (missile[i]._mirange == missile[i]._miAnimLen - 1) { SetMissDir(i, 0); - missile[i]._miAnimAdd = -1; missile[i]._miAnimFrame = 13; + missile[i]._miAnimAdd = -1; } CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 1); if (!missile[i]._mirange) {