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

Sync LoadSP2, turret_driver_die, SP_info_player_intermission declarations 

src/client/refresh/gl1/gl1_model.c:39:6: warning: type of ‘LoadSP2’ does not match original declaration [-Wlto-type-mismatch]
src/game/g_turret.c:29:6: warning: type of ‘infantry_die’ does not match original declaration [-Wlto-type-mismatch]
src/game/g_spawn.c:43:6: warning: type of ‘SP_info_player_intermission’ does not match original declaration [-Wlto-type-mismatch]
This commit is contained in:
Denis Pauk 2020-12-16 22:44:38 +02:00
parent d190c3d143
commit be2e91e142
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/refresh/gl1/gl1_sp2.c
View File

@ -26,10 +26,8 @@
#include "header/local.h" #include "header/local.h"
extern int modfilelen;
void void
LoadSP2(model_t *mod, void *buffer) LoadSP2(model_t *mod, void *buffer, int modfilelen)
{ {
dsprite_t *sprin, *sprout; dsprite_t *sprin, *sprout;
int i; int i;

6
src/game/g_turret.c
View File

@ -27,7 +27,7 @@
#include "header/local.h" #include "header/local.h"
void infantry_die(edict_t *self, edict_t *inflictor, edict_t *attacker, void infantry_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
int damage); int damage, vec3_t point);
void infantry_stand(edict_t *self); void infantry_stand(edict_t *self);
void monster_use(edict_t *self, edict_t *other, edict_t *activator); void monster_use(edict_t *self, edict_t *other, edict_t *activator);
qboolean FindTarget(edict_t *self); qboolean FindTarget(edict_t *self);
@ -410,7 +410,7 @@ SP_turret_base(edict_t *self)
*/ */
void void
turret_driver_die(edict_t *self, edict_t *inflictor, edict_t *attacker, 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; edict_t *ent;
@ -436,7 +436,7 @@ turret_driver_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
self->target_ent->owner = NULL; self->target_ent->owner = NULL;
self->target_ent->teammaster->owner = NULL; self->target_ent->teammaster->owner = NULL;
infantry_die(self, inflictor, attacker, damage); infantry_die(self, inflictor, attacker, damage, point);
} }
void void

2
src/game/player/client.c
View File

@ -392,7 +392,7 @@ SP_info_player_coop(edict_t *self)
* roll as well as yaw. 'pitch yaw roll' * roll as well as yaw. 'pitch yaw roll'
*/ */
void void
SP_info_player_intermission(void) SP_info_player_intermission(edict_t *self)
{ {
/* Thus function cannot be removed /* Thus function cannot be removed
* since the info_player_intermission * since the info_player_intermission

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

@ -194,7 +194,7 @@ extern void ClientObituary ( edict_t * self , edict_t * inflictor , edict_t * at
extern qboolean IsNeutral ( edict_t * ent ) ; extern qboolean IsNeutral ( edict_t * ent ) ;
extern qboolean IsFemale ( 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 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_coop ( edict_t * self ) ;
extern void SP_info_player_deathmatch ( edict_t * self ) ; extern void SP_info_player_deathmatch ( edict_t * self ) ;
extern void SP_info_player_start ( edict_t * self ) ; extern void SP_info_player_start ( edict_t * self ) ;