yquake2
/
xatrix
mirror of https://github.com/yquake2/xatrix.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from 0lvin/master 

Fix function prototypes
This commit is contained in:
Yamagi 2021-01-27 08:32:23 +01:00 committed by GitHub
parent 5bc4d8d092 caac536e21
commit 5e7fc8fbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/g_turret.c
View File

@ -7,7 +7,7 @@
#include "header/local.h"
void infantry_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage);
void infantry_die(edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point);
void infantry_stand(edict_t *self);
void monster_use(edict_t *self, edict_t *other, edict_t *activator);
@ -390,7 +390,7 @@ SP_turret_base(edict_t *self)
*/
void
turret_driver_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
int damage, vec3_t point /* unused */)
int damage, vec3_t point)
{
edict_t *ent;
@ -416,7 +416,7 @@ turret_driver_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
self->target_ent->owner = NULL;
self->target_ent->teammaster->owner = NULL;
infantry_die(self, inflictor, attacker, damage);
infantry_die(self, inflictor, attacker, damage, point);
}
void

4
src/player/client.c
View File

@ -18,7 +18,7 @@ SP_FixCoopSpots(edict_t *self)
/* Entity number 292 is an unnamed info_player_start
next to a named info_player_start. Delete it, if
we're in coop since it screws up the spawnpoint
selection heuristic in SelectCoopSpawnPoint().
selection heuristic in SelectCoopSpawnPoint().
This unnamed info_player_start is selected as
spawnpoint for player 0, therefor none of the
named info_coop_start() matches... */
@ -112,7 +112,7 @@ SP_info_player_coop(edict_t *self)
* roll as well as yaw. 'pitch yaw roll'
*/
void
SP_info_player_intermission(void)
SP_info_player_intermission(edict_t *ent)
{
/* This function cannot be removed
* since the info_player_intermission

2
src/savegame/tables/gamefunc_decs.h
View File

@ -178,7 +178,7 @@ extern void ClientObituary ( edict_t * self , edict_t * inflictor , edict_t * at
extern qboolean IsNeutral ( edict_t * ent ) ;
extern qboolean IsFemale ( edict_t * ent ) ;
extern void player_pain ( edict_t * self , edict_t * other , float kick , int damage ) ;
extern void SP_info_player_intermission ( void ) ;
extern void SP_info_player_intermission ( edict_t *ent );
extern void SP_info_player_coop ( edict_t * self ) ;
extern void SP_info_player_deathmatch ( edict_t * self ) ;
extern void SP_info_player_start ( edict_t * self ) ;