zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- this was nonsense. atwith is a tile number, not a sprite index.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-24 07:28:07 +02:00
parent 7e29be7569
commit 513744aa56
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/duke/src/player_d.cpp
View file

@ -993,13 +993,13 @@ static void shootgrowspark(DDukeActor* actor, int p, int sx, int sy, int sz, int
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void shoot_d(int i, int atwith) void shoot_d(int i_, int atwith)
{ {
auto actor = &hittype[i_];
spritetype* const s = &actor->s;
short sect, l, j; short sect, l, j;
int sx, sy, sz, sa, p, vel, zvel, x, dal; int sx, sy, sz, sa, p, vel, zvel, x, dal;
auto actor = &hittype[i];
spritetype* const s = &actor->s;
auto atact = &hittype[atwith];
if (s->picnum == TILE_APLAYER) if (s->picnum == TILE_APLAYER)
{ {
p = s->yvel; p = s->yvel;
@ -1009,7 +1009,7 @@ void shoot_d(int i, int atwith)
p = -1; p = -1;
} }
SetGameVarID(g_iAtWithVarID, 0, atact, p); SetGameVarID(g_iAtWithVarID, atwith, actor, p);
SetGameVarID(g_iReturnVarID, 0, actor, p); SetGameVarID(g_iReturnVarID, 0, actor, p);
OnEvent(EVENT_SHOOT, p, ps[p].GetActor(), -1); OnEvent(EVENT_SHOOT, p, ps[p].GetActor(), -1);
if (GetGameVarID(g_iReturnVarID, actor, p) != 0) if (GetGameVarID(g_iReturnVarID, actor, p) != 0)

3
source/games/duke/src/player_r.cpp
View file

@ -842,7 +842,6 @@ void shoot_r(int i, int atwith)
auto actor = &hittype[i]; auto actor = &hittype[i];
spritetype* const s = &actor->s; spritetype* const s = &actor->s;
auto atact = &hittype[atwith];
sect = s->sectnum; sect = s->sectnum;
zvel = 0; zvel = 0;
@ -873,7 +872,7 @@ void shoot_r(int i, int atwith)
} }
} }
SetGameVarID(g_iAtWithVarID, 0, atact, p); SetGameVarID(g_iAtWithVarID, atwith, actor, p);
SetGameVarID(g_iReturnVarID, 0, actor, p); SetGameVarID(g_iReturnVarID, 0, actor, p);
OnEvent(EVENT_SHOOT, p, ps[p].GetActor(), -1); OnEvent(EVENT_SHOOT, p, ps[p].GetActor(), -1);
if (GetGameVarID(g_iReturnVarID, actor, p) != 0) if (GetGameVarID(g_iReturnVarID, actor, p) != 0)