game: cleanup savegame exports

src/game/header/local.h

@@ -1730,6 +1730,20 @@ void SP_info_teleport_destination(edict_t *ent);
 void CTFSetPowerUpEffect(edict_t *ent, int def);
 void DeathmatchScoreboard(edict_t *ent);
 
+qboolean Pickup_Adrenaline(edict_t * ent, edict_t * other);
+qboolean Pickup_Ammo(edict_t * ent , edict_t * other);
+qboolean Pickup_AncientHead(edict_t * ent, edict_t * other);
+qboolean Pickup_Armor(edict_t * ent, edict_t * other);
+qboolean Pickup_Bandolier(edict_t * ent, edict_t * other);
+qboolean Pickup_Doppleganger(edict_t * ent, edict_t * other);
+qboolean Pickup_Health(edict_t * ent, edict_t * other);
+qboolean Pickup_Key(edict_t * ent, edict_t * other);
+qboolean Pickup_Nuke(edict_t * ent, edict_t * other);
+qboolean Pickup_Pack(edict_t * ent, edict_t * other);
+qboolean Pickup_PowerArmor(edict_t * ent, edict_t * other);
+qboolean Pickup_Powerup(edict_t * ent, edict_t * other);
+qboolean Pickup_Sphere(edict_t * ent, edict_t * other);
+
 /*
  * Uncomment for check that exported functions declarations are same as in
  * implementation. (-Wmissing-prototypes )

src/game/savegame/savegame.c

@@ -298,7 +298,7 @@ InitGame(void)
  * Called by WriteField1 and
  * WriteField2.
  */
-functionList_t *
+static functionList_t *
 GetFunctionByAddress(byte *adr)
 {
 	int i;
@@ -321,7 +321,7 @@ GetFunctionByAddress(byte *adr)
  * Called by WriteField1 and
  * WriteField2.
  */
-byte *
+static byte *
 FindFunctionByName(char *name)
 {
 	int i;
@@ -342,7 +342,7 @@ FindFunctionByName(char *name)
  * human readable definition of
  * a mmove_t struct by a pointer.
  */
-mmoveList_t *
+static mmoveList_t *
 GetMmoveByAddress(mmove_t *adr)
 {
 	int i;
@@ -363,7 +363,7 @@ GetMmoveByAddress(mmove_t *adr)
  * pointer to a mmove_t struct
  * by a human readable definition.
  */
-mmove_t *
+static mmove_t *
 FindMmoveByName(char *name)
 {
 	int i;
@@ -582,7 +582,7 @@ WriteField2(FILE *f, field_t *field, byte *base)
  * data is done in the functions
  * below
  */
-void
+static void
 ReadField(FILE *f, field_t *field, byte *base)
 {
 	void *p;
@@ -745,7 +745,7 @@ WriteClient(FILE *f, gclient_t *client)
 /*
  * Read the client struct from a file
  */
-void
+static void
 ReadClient(FILE *f, gclient_t *client, short save_ver)
 {
 	field_t *field;
@@ -1057,7 +1057,7 @@ WriteLevel(const char *filename)
  * into the memory. Called
  * by ReadLevel.
  */
-void
+static void
 ReadEdict(FILE *f, edict_t *ent)
 {
 	field_t *field;
@@ -1076,7 +1076,7 @@ ReadEdict(FILE *f, edict_t *ent)
  * data from a file.
  * Called by ReadLevel.
  */
-void
+static void
 ReadLevelLocals(FILE *f)
 {
 	field_t *field;

src/game/savegame/tables/gamefunc_decs.h

@@ -26,19 +26,12 @@
  * =======================================================================
  */
 
-extern byte * FindFunctionByName ( char * name ) ;
 extern byte P_DamageModifier ( edict_t * ent ) ;
 extern char * ED_NewString ( const char * string ) ;
 extern char * ED_ParseEdict ( char * data , edict_t * ent ) ;
 extern char * FindSubstituteItem ( edict_t * ent ) ;
 extern char * G_CopyString ( char * in ) ;
 extern char * Info_ValueForKey ( char * s , const char * key ) ;
-extern char * Q_strlwr ( char * s ) ;
-extern char * va ( const char * format , ... ) ;
-extern char * vtos ( vec3_t v ) ;
-extern const char * COM_FileExtension ( const char * in ) ;
-extern const char * COM_Parse ( char * * data_p ) ;
-extern const char * COM_SkipPath ( const char * pathname ) ;
 extern edict_t * CheckForBadArea ( edict_t * ent ) ;
 extern edict_t * CreateFlyMonster ( vec3_t origin , vec3_t angles , vec3_t mins , vec3_t maxs , char * classname ) ;
 extern edict_t * CreateGroundMonster ( vec3_t origin , vec3_t angles , vec3_t entMins , vec3_t entMaxs , char * classname , int height ) ;
@@ -82,8 +75,6 @@ extern float realrange ( edict_t * self , edict_t * other ) ;
 extern float target_angle ( edict_t * self ) ;
 extern float vectoyaw ( vec3_t vec ) ;
 extern float vectoyaw2 ( vec3_t vec ) ;
-extern functionList_t * GetFunctionByAddress ( byte * adr ) ;
-extern game_export_t * GetGameAPI ( game_import_t * import ) ;
 extern gitem_t * FindItem ( char * pickup_name ) ;
 extern gitem_t * FindItemByClassname ( char * classname ) ;
 extern gitem_t * GetItemByIndex ( int index ) ;
@@ -99,12 +90,6 @@ extern int DBall_CheckDMRules ( void ) ;
 extern int LittleLong ( int l ) ;
 extern int PlayerSort ( void const * a , void const * b ) ;
 extern int PowerArmorType ( edict_t * ent ) ;
-extern int Q_log2 ( int val ) ;
-extern int Q_strcasecmp ( const char * s1 , const char * s2 ) ;
-extern int Q_stricmp ( const char * s1 , const char * s2 ) ;
-extern int Q_strlcat ( char * dst , const char * src , int size ) ;
-extern int Q_strlcpy ( char * dst , const char * src , int size ) ;
-extern int Q_strncasecmp ( const char * s1 , const char * s2 , int n ) ;
 extern int SV_FlyMove ( edict_t * ent , float time , int mask ) ;
 extern int Tag_ChangeDamage ( edict_t * targ , edict_t * attacker , int damage , int mod ) ;
 extern int VectorCompare ( const vec3_t v1 , const vec3_t v2 ) ;
@@ -115,8 +100,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 mmoveList_t * GetMmoveByAddress ( mmove_t * adr ) ;
-extern mmove_t * FindMmoveByName ( char * name ) ;
 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 ) ;
@@ -235,10 +218,6 @@ extern void Boss2MachineGun ( edict_t * self ) ;
 extern void Boss2Rocket ( edict_t * self ) ;
 extern void BossExplode ( edict_t * self ) ;
 extern void BossExplode2 ( edict_t * self ) ;
-extern void COM_DefaultExtension ( char * path , const char * extension ) ;
-extern void COM_FileBase ( const char * in , char * out ) ;
-extern void COM_FilePath ( const char * in , char * out ) ;
-extern void COM_StripExtension ( const char * in , char * out ) ;
 extern void CarrierCoopCheck ( edict_t * self ) ;
 extern void CarrierGrenade ( edict_t * self ) ;
 extern void CarrierMachineGun ( edict_t * self ) ;
@@ -421,12 +400,8 @@ extern void Prox_Field_Touch ( edict_t * ent , edict_t * other , cplane_t * plan
 extern void PutClientInServer ( edict_t * ent ) ;
 extern void R_ConcatRotations ( const float in1 [ 3 ] [ 3 ] , const float in2 [ 3 ] [ 3 ] , float out [ 3 ] [ 3 ] ) ;
 extern void R_ConcatTransforms ( const float in1 [ 3 ] [ 4 ] , const float in2 [ 3 ] [ 4 ] , float out [ 3 ] [ 4 ] ) ;
-extern void ReadClient ( FILE * f , gclient_t * client , short save_ver ) ;
-extern void ReadEdict ( FILE * f , edict_t * ent ) ;
-extern void ReadField ( FILE * f , field_t * field , byte * base ) ;
 extern void ReadGame ( const char * filename ) ;
 extern void ReadLevel ( const char * filename ) ;
-extern void ReadLevelLocals ( FILE * f ) ;
 extern void RealBoundingBox ( edict_t * ent , vec3_t mins , vec3_t maxs ) ;
 extern void RemoveAttackingPainDaemons ( edict_t * self ) ;
 extern void RotatePointAroundVector ( vec3_t dst , const vec3_t dir , const vec3_t point , float degrees ) ;
@@ -798,9 +773,6 @@ extern void WriteField2 ( FILE * f , field_t * field , byte * base ) ;
 extern void WriteGame ( const char * filename , qboolean autosave ) ;
 extern void WriteLevel ( const char * filename ) ;
 extern void WriteLevelLocals ( FILE * f ) ;
-extern void _VectorAdd ( const vec3_t veca , const vec3_t vecb , vec3_t out ) ;
-extern void _VectorCopy( const vec3_t in , vec3_t out ) ;
-extern void _VectorSubtract ( const vec3_t veca , const vec3_t vecb , vec3_t out ) ;
 extern void abortHeal ( edict_t *self, qboolean change_frame, qboolean gib, qboolean mark ) ;
 extern void actorMachineGun ( edict_t * self ) ;
 extern void actor_attack ( edict_t * self ) ;

src/game/savegame/tables/gamefunc_list.h

@@ -50,13 +50,6 @@
 {"Boss2_CheckAttack", (byte *)Boss2_CheckAttack},
 {"BossExplode", (byte *)BossExplode},
 {"BossExplode2", (byte *)BossExplode2},
-{"COM_DefaultExtension", (byte *)COM_DefaultExtension},
-{"COM_FileBase", (byte *)COM_FileBase},
-{"COM_FileExtension", (byte *)COM_FileExtension},
-{"COM_FilePath", (byte *)COM_FilePath},
-{"COM_Parse", (byte *)COM_Parse},
-{"COM_SkipPath", (byte *)COM_SkipPath},
-{"COM_StripExtension", (byte *)COM_StripExtension},
 {"CanDamage", (byte *)CanDamage},
 {"CarrierCoopCheck", (byte *)CarrierCoopCheck},
 {"CarrierGrenade", (byte *)CarrierGrenade},
@@ -164,10 +157,8 @@
 {"ExitLevel", (byte *)ExitLevel},
 {"FacingIdeal", (byte *)FacingIdeal},
 {"FetchClientEntData", (byte *)FetchClientEntData},
-{"FindFunctionByName", (byte *)FindFunctionByName},
 {"FindItem", (byte *)FindItem},
 {"FindItemByClassname", (byte *)FindItemByClassname},
-{"FindMmoveByName", (byte *)FindMmoveByName},
 {"FindSpawnPoint", (byte *)FindSpawnPoint},
 {"FindSubstituteItem", (byte *)FindSubstituteItem},
 {"FindTarget", (byte *)FindTarget},
@@ -196,10 +187,7 @@
 {"G_UseTargets", (byte *)G_UseTargets},
 {"GaldiatorMelee", (byte *)GaldiatorMelee},
 {"GetChaseTarget", (byte *)GetChaseTarget},
-{"GetFunctionByAddress", (byte *)GetFunctionByAddress},
-{"GetGameAPI", (byte *)GetGameAPI},
 {"GetItemByIndex", (byte *)GetItemByIndex},
-{"GetMmoveByAddress", (byte *)GetMmoveByAddress},
 {"GladbMelee", (byte *)GladbMelee},
 {"GladiatorGun", (byte *)GladiatorGun},
 {"Grenade_Explode", (byte *)Grenade_Explode},
@@ -316,21 +304,10 @@
 {"Prox_Explode", (byte *)Prox_Explode},
 {"Prox_Field_Touch", (byte *)Prox_Field_Touch},
 {"PutClientInServer", (byte *)PutClientInServer},
-{"Q_log2", (byte *)Q_log2},
-{"Q_strcasecmp", (byte *)Q_strcasecmp},
-{"Q_stricmp", (byte *)Q_stricmp},
-{"Q_strlcat", (byte *)Q_strlcat},
-{"Q_strlcpy", (byte *)Q_strlcpy},
-{"Q_strlwr", (byte *)Q_strlwr},
-{"Q_strncasecmp", (byte *)Q_strncasecmp},
 {"R_ConcatRotations", (byte *)R_ConcatRotations},
 {"R_ConcatTransforms", (byte *)R_ConcatTransforms},
-{"ReadClient", (byte *)ReadClient},
-{"ReadEdict", (byte *)ReadEdict},
-{"ReadField", (byte *)ReadField},
 {"ReadGame", (byte *)ReadGame},
 {"ReadLevel", (byte *)ReadLevel},
-{"ReadLevelLocals", (byte *)ReadLevelLocals},
 {"RealBoundingBox", (byte *)RealBoundingBox},
 {"RemoveAttackingPainDaemons", (byte *)RemoveAttackingPainDaemons},
 {"RotatePointAroundVector", (byte *)RotatePointAroundVector},
@@ -729,10 +706,6 @@
 {"WriteGame", (byte *)WriteGame},
 {"WriteLevel", (byte *)WriteLevel},
 {"WriteLevelLocals", (byte *)WriteLevelLocals},
-{"_DotProduct", (byte *)_DotProduct},
-{"_VectorAdd", (byte *)_VectorAdd},
-{"_VectorCopy", (byte *)_VectorCopy},
-{"_VectorSubtract", (byte *)_VectorSubtract},
 {"abortHeal", (byte *)abortHeal},
 {"actorMachineGun", (byte *)actorMachineGun},
 {"actor_attack", (byte *)actor_attack},
@@ -1769,7 +1742,6 @@
 {"use_target_spawner", (byte *)use_target_spawner},
 {"use_target_splash", (byte *)use_target_splash},
 {"use_target_steam", (byte *)use_target_steam},
-{"va", (byte *)va},
 {"vectoangles", (byte *)vectoangles},
 {"vectoangles2", (byte *)vectoangles2},
 {"vectoyaw", (byte *)vectoyaw},
@@ -1778,7 +1750,6 @@
 {"vengeance_think", (byte *)vengeance_think},
 {"vengeance_touch", (byte *)vengeance_touch},
 {"visible", (byte *)visible},
-{"vtos", (byte *)vtos},
 {"wait_and_change_think", (byte *)wait_and_change_think},
 {"walkmonster_start", (byte *)walkmonster_start},
 {"walkmonster_start_go", (byte *)walkmonster_start_go},