zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-31 22:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed parameter ordering for WW2GI's change weapon event call.

Browse source 
This happens when variables are ambiguously named... :?
This commit is contained in:
Christoph Oelckers 2020-10-21 07:31:21 +02:00
parent 99e3eeb19e
commit 05c095e448
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/duke/src/actors.cpp
View file

@ -170,16 +170,16 @@ void checkavailweapon(struct player_struct* p)
p->curr_weapon = weap; p->curr_weapon = weap;
if (isWW2GI()) if (isWW2GI())
{ {
SetGameVarID(g_iWeaponVarID, p->curr_weapon, snum, p->i); SetGameVarID(g_iWeaponVarID, p->curr_weapon, p->i, snum); // snum is playerindex!
if (p->curr_weapon >= 0) if (p->curr_weapon >= 0)
{ {
SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike[p->curr_weapon][snum], snum, p->i); SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike[p->curr_weapon][snum], p->i, snum);
} }
else else
{ {
SetGameVarID(g_iWorksLikeVarID, -1, snum, p->i); SetGameVarID(g_iWorksLikeVarID, -1, p->i, snum);
} }
OnEvent(EVENT_CHANGEWEAPON, p->i, snum, -1); OnEvent(EVENT_CHANGEWEAPON, snum, p->i, -1);
} }
p->okickback_pic = p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;

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

@ -469,7 +469,7 @@ static void shootstuff(int i, int p, int sx, int sy, int sz, int sa, int atwith)
spritetype* const s = &sprite[i]; spritetype* const s = &sprite[i];
int sect = s->sectnum; int sect = s->sectnum;
int vel, zvel; int vel, zvel;
short l, j, scount; short j, scount;
if (isRRRA()) if (isRRRA())
{ {
@ -764,7 +764,7 @@ static void shootwhip(int i, int p, int sx, int sy, int sz, int sa, int atwith)
spritetype* const s = &sprite[i]; spritetype* const s = &sprite[i];
int sect = s->sectnum; int sect = s->sectnum;
int vel, zvel; int vel, zvel;
short l, j, scount; short j, scount;
if (s->extra >= 0) s->shade = -96; if (s->extra >= 0) s->shade = -96;
@ -837,9 +837,8 @@ static void shootwhip(int i, int p, int sx, int sy, int sz, int sa, int atwith)
void shoot_r(int i, int atwith) void shoot_r(int i, int atwith)
{ {
short sect, hitsect, hitspr, hitwall, l, sa, p, j, k, scount; short sect, sa, p, j;
int sx, sy, sz, vel, zvel, hitx, hity, hitz, x, oldzvel, dal; int sx, sy, sz, vel, zvel, x;
uint8_t sizx, sizy;
spritetype* s; spritetype* s;
s = &sprite[i]; s = &sprite[i];