From 4e92b008c0afc3b0e3d5e1073c914e5eddb8201a Mon Sep 17 00:00:00 2001 From: Denis Pauk Date: Sun, 25 Feb 2024 17:41:46 +0200 Subject: [PATCH] game: do not export non edict_t function as gamefunc --- src/game/g_spawn.c | 2 +- src/game/monster/brain/brain.c | 2 +- src/game/monster/parasite/parasite.c | 2 +- src/game/monster/stalker/stalker.c | 3 +-- src/game/monster/widow/widow2.c | 2 +- src/game/savegame/tables/gamefunc_decs.h | 15 --------------- src/game/savegame/tables/gamefunc_list.h | 15 --------------- 7 files changed, 5 insertions(+), 36 deletions(-) diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c index e8491788..7559a661 100644 --- a/src/game/g_spawn.c +++ b/src/game/g_spawn.c @@ -404,7 +404,7 @@ G_FixTeams(void) gi.dprintf("%i teams repaired\n", c); } -void +static void G_FindTeams(void) { edict_t *e, *e2, *chain; diff --git a/src/game/monster/brain/brain.c b/src/game/monster/brain/brain.c index eca616c8..5c33870f 100644 --- a/src/game/monster/brain/brain.c +++ b/src/game/monster/brain/brain.c @@ -657,7 +657,7 @@ brain_melee(edict_t *self) } } -qboolean +static qboolean brain_tounge_attack_ok(vec3_t start, vec3_t end) { vec3_t dir, angles; diff --git a/src/game/monster/parasite/parasite.c b/src/game/monster/parasite/parasite.c index d6433d17..9c48b3c0 100644 --- a/src/game/monster/parasite/parasite.c +++ b/src/game/monster/parasite/parasite.c @@ -479,7 +479,7 @@ parasite_pain(edict_t *self, edict_t *other /* unused */, self->monsterinfo.currentmove = ¶site_move_pain1; } -qboolean +static qboolean parasite_drain_attack_ok(vec3_t start, vec3_t end) { vec3_t dir, angles; diff --git a/src/game/monster/stalker/stalker.c b/src/game/monster/stalker/stalker.c index 21f3f553..6a280459 100644 --- a/src/game/monster/stalker/stalker.c +++ b/src/game/monster/stalker/stalker.c @@ -49,7 +49,6 @@ void stalker_jump_straightup(edict_t *self); void stalker_jump_wait_land(edict_t *self); void stalker_false_death(edict_t *self); void stalker_false_death_start(edict_t *self); -qboolean stalker_ok_to_transition(edict_t *self); #define STALKER_ON_CEILING(ent) (ent->gravityVector[2] > 0 ? 1 : 0) @@ -61,7 +60,7 @@ qboolean stalker_ok_to_transition(edict_t *self); extern qboolean SV_PointCloseEnough(edict_t *ent, vec3_t goal, float dist); extern void drawbbox(edict_t *self); -qboolean +static qboolean stalker_ok_to_transition(edict_t *self) { trace_t trace; diff --git a/src/game/monster/widow/widow2.c b/src/game/monster/widow/widow2.c index c8d85431..586482b7 100644 --- a/src/game/monster/widow/widow2.c +++ b/src/game/monster/widow/widow2.c @@ -563,7 +563,7 @@ mmove_t widow2_move_spawn = { NULL }; -qboolean +static qboolean widow2_tongue_attack_ok(vec3_t start, vec3_t end, float range) { vec3_t dir, angles; diff --git a/src/game/savegame/tables/gamefunc_decs.h b/src/game/savegame/tables/gamefunc_decs.h index a5a01bc9..9cd62860 100644 --- a/src/game/savegame/tables/gamefunc_decs.h +++ b/src/game/savegame/tables/gamefunc_decs.h @@ -28,7 +28,6 @@ extern edict_t * DoRandomRespawn ( edict_t * ent ) ; extern edict_t * Drop_Item ( edict_t * ent , gitem_t * item ) ; -extern edict_t * G_Find ( edict_t * from , int fieldofs , char * match ) ; extern edict_t * G_PickTarget ( char * targetname ) ; extern edict_t * G_Spawn ( void ) ; extern edict_t * PickBallStart ( edict_t * ent ) ; @@ -52,7 +51,6 @@ extern int flyer_blocked ( edict_t * self , float dist ) ; extern int range ( edict_t * self , edict_t * other ) ; extern int stalker_check_lz ( edict_t * self , edict_t * target , vec3_t dest ) ; extern int stalker_do_pounce ( edict_t * self , vec3_t dest ) ; -extern qboolean Add_Ammo ( edict_t * ent , gitem_t * item , int count ) ; extern qboolean Boss2_CheckAttack ( edict_t * self ) ; extern qboolean CanDamage ( edict_t * targ , edict_t * inflictor ) ; extern qboolean Carrier_CheckAttack ( edict_t * self ) ; @@ -83,7 +81,6 @@ extern qboolean Pickup_Powerup ( edict_t * ent , edict_t * other ) ; extern qboolean Pickup_Sphere ( edict_t * ent , edict_t * other ) ; extern qboolean Pickup_Weapon ( edict_t * ent , edict_t * other ) ; extern qboolean SV_CloseEnough ( edict_t * ent , edict_t * goal , float dist ) ; -extern qboolean SV_FilterPacket ( char * from ) ; extern qboolean SV_RunThink ( edict_t * ent ) ; extern qboolean SV_StepDirection ( edict_t * ent , float yaw , float dist ) ; extern qboolean SV_movestep ( edict_t * ent , vec3_t move , qboolean relink ) ; @@ -96,7 +93,6 @@ extern qboolean berserk_blocked ( edict_t * self , float dist ) ; extern qboolean blocked_checkjump ( edict_t * self , float dist , float maxDown , float maxUp ) ; extern qboolean blocked_checknewenemy ( edict_t * self ) ; extern qboolean blocked_checkplat ( edict_t * self , float dist ) ; -extern qboolean brain_tounge_attack_ok ( vec3_t start , vec3_t end ) ; extern qboolean canReach(edict_t *self, edict_t *other) ; extern qboolean chick_blocked ( edict_t * self , float dist ) ; extern qboolean face_wall ( edict_t * self ) ; @@ -125,17 +121,13 @@ extern qboolean mutant_check_melee ( edict_t * self ) ; extern qboolean mutant_checkattack ( edict_t * self ) ; extern qboolean parasite_blocked ( edict_t * self , float dist ) ; extern qboolean parasite_checkattack ( edict_t * self ) ; -extern qboolean parasite_drain_attack_ok ( vec3_t start , vec3_t end ) ; extern qboolean soldier_blocked ( edict_t * self , float dist ) ; extern qboolean stalker_blocked ( edict_t * self , float dist ) ; -extern qboolean stalker_ok_to_transition ( edict_t * self ) ; extern qboolean supertank_blocked ( edict_t * self , float dist ) ; extern qboolean tank_blocked( edict_t *self, float dist ); extern qboolean turret_checkattack ( edict_t * self ) ; extern qboolean visible ( edict_t * self , edict_t * other ) ; -extern qboolean widow2_tongue_attack_ok ( vec3_t start , vec3_t end , float range ) ; extern qboolean widow_blocked ( edict_t * self , float dist ) ; -extern void AddPointToBounds ( const vec3_t v , vec3_t mins , vec3_t maxs ) ; extern void AngleMove_Begin ( edict_t * ent ) ; extern void AngleMove_Calc ( edict_t * ent , void ( * func ) ( edict_t * ) ) ; extern void AngleMove_Done ( edict_t * ent ) ; @@ -166,7 +158,6 @@ extern void ChickReload ( edict_t * self ) ; extern void ChickRocket ( edict_t * self ) ; extern void ChickSlash ( edict_t * self ) ; extern void Chick_PreAttack1 ( edict_t * self ) ; -extern void ClearBounds ( vec3_t mins , vec3_t maxs ) ; extern void ClientBegin ( edict_t * ent ) ; extern void ClientBeginDeathmatch ( edict_t * ent ) ; extern void ClientBeginServerFrame ( edict_t * ent ) ; @@ -181,9 +172,7 @@ extern void DBall_BallDie ( edict_t * self , edict_t * inflictor , edict_t * att extern void DBall_BallPain ( edict_t * self , edict_t * other , float kick , int damage ) ; extern void DBall_BallRespawn ( edict_t * self ) ; extern void DBall_BallTouch ( edict_t * ent , edict_t * other , cplane_t * plane , csurface_t * surf ) ; -extern void DBall_GameInit ( void ) ; extern void DBall_GoalTouch ( edict_t * self , edict_t * other , cplane_t * plane , csurface_t * surf ) ; -extern void DBall_PostInitSetup ( void ) ; extern void DBall_SpeedTouch ( edict_t * self , edict_t * other , cplane_t * plane , csurface_t * surf ) ; extern void Defender_Launch ( edict_t * self ) ; extern void DoRespawn ( edict_t * ent ) ; @@ -192,11 +181,7 @@ extern void Drop_Ammo ( edict_t * ent , gitem_t * item ) ; extern void Drop_General ( edict_t * ent , gitem_t * item ) ; extern void Drop_PowerArmor ( edict_t * ent , gitem_t * item ) ; extern void Drop_Weapon ( edict_t * ent , gitem_t * item ) ; -extern void G_CheckChaseStats ( edict_t * ent ) ; -extern void G_FindTeams ( void ) ; extern void G_FreeEdict ( edict_t * ed ) ; -extern void G_InitEdict ( edict_t * e ) ; -extern void G_RunEntity ( edict_t * ent ) ; extern void G_TouchSolids ( edict_t * ent ) ; extern void G_TouchTriggers ( edict_t * ent ) ; extern void G_UseTargets ( edict_t * ent , edict_t * activator ) ; diff --git a/src/game/savegame/tables/gamefunc_list.h b/src/game/savegame/tables/gamefunc_list.h index e015baef..40c072f6 100644 --- a/src/game/savegame/tables/gamefunc_list.h +++ b/src/game/savegame/tables/gamefunc_list.h @@ -26,8 +26,6 @@ * ======================================================================= */ -{"AddPointToBounds", (byte *)AddPointToBounds}, -{"Add_Ammo", (byte *)Add_Ammo}, {"AngleMove_Begin", (byte *)AngleMove_Begin}, {"AngleMove_Calc", (byte *)AngleMove_Calc}, {"AngleMove_Done", (byte *)AngleMove_Done}, @@ -62,7 +60,6 @@ {"ChickRocket", (byte *)ChickRocket}, {"ChickSlash", (byte *)ChickSlash}, {"Chick_PreAttack1", (byte *)Chick_PreAttack1}, -{"ClearBounds", (byte *)ClearBounds}, {"ClientBegin", (byte *)ClientBegin}, {"ClientBeginDeathmatch", (byte *)ClientBeginDeathmatch}, {"ClientBeginServerFrame", (byte *)ClientBeginServerFrame}, @@ -80,9 +77,7 @@ {"DBall_BallTouch", (byte *)DBall_BallTouch}, {"DBall_ChangeDamage", (byte *)DBall_ChangeDamage}, {"DBall_ChangeKnockback", (byte *)DBall_ChangeKnockback}, -{"DBall_GameInit", (byte *)DBall_GameInit}, {"DBall_GoalTouch", (byte *)DBall_GoalTouch}, -{"DBall_PostInitSetup", (byte *)DBall_PostInitSetup}, {"DBall_SpeedTouch", (byte *)DBall_SpeedTouch}, {"Defender_Launch", (byte *)Defender_Launch}, {"DoRandomRespawn", (byte *)DoRandomRespawn}, @@ -94,13 +89,8 @@ {"Drop_PowerArmor", (byte *)Drop_PowerArmor}, {"Drop_Weapon", (byte *)Drop_Weapon}, {"FacingIdeal", (byte *)FacingIdeal}, -{"G_CheckChaseStats", (byte *)G_CheckChaseStats}, -{"G_Find", (byte *)G_Find}, -{"G_FindTeams", (byte *)G_FindTeams}, {"G_FreeEdict", (byte *)G_FreeEdict}, -{"G_InitEdict", (byte *)G_InitEdict}, {"G_PickTarget", (byte *)G_PickTarget}, -{"G_RunEntity", (byte *)G_RunEntity}, {"G_Spawn", (byte *)G_Spawn}, {"G_TouchSolids", (byte *)G_TouchSolids}, {"G_TouchTriggers", (byte *)G_TouchTriggers}, @@ -195,7 +185,6 @@ {"SV_CalcViewOffset", (byte *)SV_CalcViewOffset}, {"SV_CheckVelocity", (byte *)SV_CheckVelocity}, {"SV_CloseEnough", (byte *)SV_CloseEnough}, -{"SV_FilterPacket", (byte *)SV_FilterPacket}, {"SV_FixCheckBottom", (byte *)SV_FixCheckBottom}, {"SV_FlyMove", (byte *)SV_FlyMove}, {"SV_Impact", (byte *)SV_Impact}, @@ -477,7 +466,6 @@ {"brain_swing_right", (byte *)brain_swing_right}, {"brain_tentacle_attack", (byte *)brain_tentacle_attack}, {"brain_tounge_attack", (byte *)brain_tounge_attack}, -{"brain_tounge_attack_ok", (byte *)brain_tounge_attack_ok}, {"brain_walk", (byte *)brain_walk}, {"button_done", (byte *)button_done}, {"button_fire", (byte *)button_fire}, @@ -1045,7 +1033,6 @@ {"parasite_die", (byte *)parasite_die}, {"parasite_do_fidget", (byte *)parasite_do_fidget}, {"parasite_drain_attack", (byte *)parasite_drain_attack}, -{"parasite_drain_attack_ok", (byte *)parasite_drain_attack_ok}, {"parasite_end_fidget", (byte *)parasite_end_fidget}, {"parasite_idle", (byte *)parasite_idle}, {"parasite_jump", (byte *)parasite_jump}, @@ -1229,7 +1216,6 @@ {"stalker_jump_straightup", (byte *)stalker_jump_straightup}, {"stalker_jump_up", (byte *)stalker_jump_up}, {"stalker_jump_wait_land", (byte *)stalker_jump_wait_land}, -{"stalker_ok_to_transition", (byte *)stalker_ok_to_transition}, {"stalker_pain", (byte *)stalker_pain}, {"stalker_reactivate", (byte *)stalker_reactivate}, {"stalker_run", (byte *)stalker_run}, @@ -1411,7 +1397,6 @@ {"widow2_spawn_check", (byte *)widow2_spawn_check}, {"widow2_stand", (byte *)widow2_stand}, {"widow2_start_searching", (byte *)widow2_start_searching}, -{"widow2_tongue_attack_ok", (byte *)widow2_tongue_attack_ok}, {"widow2_walk", (byte *)widow2_walk}, {"widow_attack", (byte *)widow_attack}, {"widow_attack_blaster", (byte *)widow_attack_blaster},