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

player.c: make four functions file-local.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3418 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-01-20 21:17:19 +00:00
parent 9103d4987c
commit 671bd67aa8
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2005,7 +2005,7 @@ static void P_FireWeapon(DukePlayer_t *p)
} }
} }
void P_DoWeaponSpawn(DukePlayer_t *p) static void P_DoWeaponSpawn(const DukePlayer_t *p)
{ {
int32_t j, snum = sprite[p->i].yvel; int32_t j, snum = sprite[p->i].yvel;
@ -3341,7 +3341,7 @@ void P_CheckWeapon(DukePlayer_t *p)
P_ChangeWeapon(p, weapon); P_ChangeWeapon(p, weapon);
} }
void P_CheckTouchDamage(DukePlayer_t *p, int32_t obj) static void P_CheckTouchDamage(DukePlayer_t *p, int32_t obj)
{ {
if ((obj = VM_OnEvent(EVENT_CHECKTOUCHDAMAGE, p->i, sprite[p->i].yvel, -1, obj)) == -1) if ((obj = VM_OnEvent(EVENT_CHECKTOUCHDAMAGE, p->i, sprite[p->i].yvel, -1, obj)) == -1)
return; return;
@ -3415,7 +3415,7 @@ void P_CheckTouchDamage(DukePlayer_t *p, int32_t obj)
} }
} }
int32_t P_CheckFloorDamage(DukePlayer_t *p, int32_t tex) static int32_t P_CheckFloorDamage(DukePlayer_t *p, int32_t tex)
{ {
spritetype *s = &sprite[p->i]; spritetype *s = &sprite[p->i];
@ -4043,7 +4043,6 @@ static void P_ProcessWeapon(int32_t snum)
} }
else if (((*kb) == (PWEAPON(snum, p->curr_weapon, Reload) - (i/3)) && else if (((*kb) == (PWEAPON(snum, p->curr_weapon, Reload) - (i/3)) &&
!(PWEAPON(snum, p->curr_weapon, Flags) & WEAPON_RELOAD_TIMING)) || !(PWEAPON(snum, p->curr_weapon, Flags) & WEAPON_RELOAD_TIMING)) ||
((*kb) == (PWEAPON(snum, p->curr_weapon, Reload) - i+4) && ((*kb) == (PWEAPON(snum, p->curr_weapon, Reload) - i+4) &&
(PWEAPON(snum, p->curr_weapon, Flags) & WEAPON_RELOAD_TIMING))) (PWEAPON(snum, p->curr_weapon, Flags) & WEAPON_RELOAD_TIMING)))
{ {
@ -4142,7 +4141,7 @@ static void P_ProcessWeapon(int32_t snum)
} }
} }
int32_t P_DoFist(DukePlayer_t *p) static int32_t P_DoFist(DukePlayer_t *p)
{ {
// the fist punching NUKEBUTTON // the fist punching NUKEBUTTON

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

@ -339,13 +339,9 @@ void getinput(int32_t snum);
void P_AddAmmo(int32_t weapon,DukePlayer_t *p,int32_t amount); void P_AddAmmo(int32_t weapon,DukePlayer_t *p,int32_t amount);
void P_AddWeapon(DukePlayer_t *p,int32_t weapon); void P_AddWeapon(DukePlayer_t *p,int32_t weapon);
void P_AddWeaponNoSwitch(DukePlayer_t *p,int32_t weapon); void P_AddWeaponNoSwitch(DukePlayer_t *p,int32_t weapon);
int32_t P_CheckFloorDamage(DukePlayer_t *p,int32_t j);
void P_CheckTouchDamage(DukePlayer_t *p,int32_t j);
void P_CheckWeapon(DukePlayer_t *p); void P_CheckWeapon(DukePlayer_t *p);
void P_DisplayScuba(int32_t snum); void P_DisplayScuba(int32_t snum);
void P_DisplayWeapon(int32_t snum); void P_DisplayWeapon(int32_t snum);
int32_t P_DoFist(DukePlayer_t *p);
void P_DoWeaponSpawn(DukePlayer_t *p);
void P_DropWeapon(DukePlayer_t *p); void P_DropWeapon(DukePlayer_t *p);
int32_t P_FindOtherPlayer(int32_t p,int32_t *d); int32_t P_FindOtherPlayer(int32_t p,int32_t *d);
void P_FragPlayer(int32_t snum); void P_FragPlayer(int32_t snum);