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

player.c: factor out repeated code into P_SetWeaponGamevars().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3413 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-01-20 21:16:54 +00:00
parent fdd652fd1a
commit cd1f3739d9
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
polymer/eduke32/source/player.c
View file

@ -1925,6 +1925,20 @@ static int32_t P_DisplayKnuckles(int32_t gs,int32_t snum)
return 1;
}
void P_SetWeaponGamevars(int32_t snum, const DukePlayer_t *p)
{
#ifdef LUNATIC
UNREFERENCED_PARAMETER(snum);
UNREFERENCED_PARAMETER(p);
#else
Gv_SetVar(g_iWeaponVarID, p->curr_weapon, p->i, snum);
Gv_SetVar(g_iWorksLikeVarID,
((unsigned)p->curr_weapon < MAX_WEAPONS) ? PWEAPON(snum, p->curr_weapon, WorksLike) : -1,
p->i, snum);
#endif
}
static void P_FireWeapon(DukePlayer_t *p)
{
int32_t i, snum = sprite[p->i].yvel;
@ -1939,8 +1953,7 @@ static void P_FireWeapon(DukePlayer_t *p)
if (PWEAPON(snum, p->curr_weapon, FireSound) > 0)
A_PlaySound(PWEAPON(snum, p->curr_weapon, FireSound),p->i);
Gv_SetVar(g_iWeaponVarID,p->curr_weapon,p->i,snum);
Gv_SetVar(g_iWorksLikeVarID,PWEAPON(snum, p->curr_weapon, WorksLike), p->i, snum);
P_SetWeaponGamevars(snum, p);
// OSD_Printf("doing %d %d %d\n",PWEAPON(snum, p->curr_weapon, Shoots),p->curr_weapon,snum);
A_Shoot(p->i,PWEAPON(snum, p->curr_weapon, Shoots));
@ -3246,10 +3259,7 @@ void P_ChangeWeapon(DukePlayer_t *p,int32_t weapon)
p->kickback_pic = 0;
Gv_SetVar(g_iWeaponVarID, p->curr_weapon, p->i, snum);
Gv_SetVar(g_iWorksLikeVarID,
(unsigned)p->curr_weapon < MAX_WEAPONS ? PWEAPON(snum, p->curr_weapon, WorksLike) : -1,
p->i, snum);
P_SetWeaponGamevars(snum, p);
}
void P_AddWeapon(DukePlayer_t *p,int32_t weapon)
@ -3621,8 +3631,7 @@ static void P_ProcessWeapon(int32_t snum)
if (TEST_SYNC_KEY(sb_snum, SK_FIRE))
{
Gv_SetVar(g_iWeaponVarID,p->curr_weapon,p->i,snum);
Gv_SetVar(g_iWorksLikeVarID,PWEAPON(snum, p->curr_weapon, WorksLike),p->i,snum);
P_SetWeaponGamevars(snum, p);
if (VM_OnEvent(EVENT_PRESSEDFIRE, p->i, snum, -1, 0) != 0)
sb_snum &= ~BIT(SK_FIRE);
@ -3630,8 +3639,7 @@ static void P_ProcessWeapon(int32_t snum)
if (TEST_SYNC_KEY(sb_snum, SK_HOLSTER)) // 'Holster Weapon
{
Gv_SetVar(g_iWeaponVarID,p->curr_weapon,p->i,snum);
Gv_SetVar(g_iWorksLikeVarID,PWEAPON(snum, p->curr_weapon, WorksLike),p->i,snum);
P_SetWeaponGamevars(snum, p);
if (VM_OnEvent(EVENT_HOLSTER, p->i, snum, -1, 0) == 0)
{
@ -3732,8 +3740,7 @@ static void P_ProcessWeapon(int32_t snum)
}
else
{
Gv_SetVar(g_iWeaponVarID,p->curr_weapon,p->i,snum);
Gv_SetVar(g_iWorksLikeVarID,PWEAPON(snum, p->curr_weapon, WorksLike),p->i,snum);
P_SetWeaponGamevars(snum, p);
if (VM_OnEvent(EVENT_FIRE, p->i, snum, -1, 0) == 0)
{
@ -3947,8 +3954,8 @@ static void P_ProcessWeapon(int32_t snum)
lastvisinc = totalclock+32;
p->visibility = 0;
}
Gv_SetVar(g_iWeaponVarID,p->curr_weapon,p->i,snum);
Gv_SetVar(g_iWorksLikeVarID,PWEAPON(snum, p->curr_weapon, WorksLike), p->i, snum);
P_SetWeaponGamevars(snum, p);
A_Shoot(p->i, PWEAPON(snum, p->curr_weapon, Shoots));
}
}

1
polymer/eduke32/source/player.h
View file

@ -355,5 +355,6 @@ void P_QuickKill(DukePlayer_t *p);
void P_SelectNextInvItem(DukePlayer_t *p);
void P_UpdateScreenPal(DukePlayer_t *p);
void P_PalFrom(DukePlayer_t *p, uint8_t f, uint8_t r, uint8_t g, uint8_t b);
void P_SetWeaponGamevars(int32_t snum, const DukePlayer_t *p);
#endif

3
polymer/eduke32/source/sector.c
View file

@ -2756,8 +2756,7 @@ CHECKINV1:
}
}
Gv_SetVar(g_iWorksLikeVarID,PWEAPON(snum, p->curr_weapon, WorksLike),p->i,snum);
Gv_SetVar(g_iWeaponVarID,j, p->i, snum);
P_SetWeaponGamevars(snum, p);
j = VM_OnEvent(EVENT_SELECTWEAPON,p->i,snum, -1, j);