ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-22 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

annotations and fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-06-07 22:00:48 +02:00
parent 7f30f4cf93
commit 3021fee5b6
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/game/g_local.h
View file

@ -706,9 +706,9 @@ typedef struct {
vec3_t intermission_angle; /*!< Angle of the camera for intermission. Also used for spectator spawns. */
qboolean locationLinked; /*!< target_locations get linked */
gentity_t* locationHead; /*!< head of the location list */
/*@shared@*/ /*@null@*/ gentity_t* locationHead; /*!< head of the location list */
int bodyQueIndex; /*!< dead bodies */
gentity_t* bodyQue[BODY_QUEUE_SIZE]; /*!< body Que */
/*@shared@*/ gentity_t* bodyQue[BODY_QUEUE_SIZE]; /*!< body Que */
int numObjectives; /*! Number of level objectives (unused) */
@ -1401,7 +1401,7 @@ qboolean CanDamage (gentity_t* targ, vec3_t origin);
* DAMAGE_NO_KNOCKBACK do not affect velocity, just view angles
* DAMAGE_NO_PROTECTION kills godmode, armor, everything
*/
void G_Damage (gentity_t* targ, /*@null@*/ gentity_t* inflictor, /*@null@*/ gentity_t* attacker, vec3_t dir, vec3_t point, int damage, int dflags, int mod);
void G_Damage (gentity_t* targ, /*@null@*/ gentity_t* inflictor, /*@null@*/ gentity_t* attacker, /*@null@*/ vec3_t dir, /*@null@*/ vec3_t point, int damage, int dflags, int mod);
/**
* Damage all entities around an origin in a specified radius.
@ -3030,7 +3030,7 @@ void trap_SendServerCommand( int clientNum, const char* text );
* \param num CS_...
* \param string set cofig string to this
*/
void trap_SetConfigstring( int num, const char* string );
void trap_SetConfigstring( int num, /*@null@*/ const char* string );
/**
* Get a configstring

10
code/game/g_target.c
View file

@ -580,14 +580,16 @@ static void target_relay_use (/*@shared@*/ gentity_t *self, /*@shared@*/ /*@unus
if((self->spawnflags & 8) != 0) {
ent->use(ent, self, self);
#ifdef G_LUA
if(ent->luaUse != NULL)
if(self->luaUse != NULL) {
LuaHook_G_EntityUse(self->luaUse, self->s.number, self->s.number, self->s.number);
}
#endif
} else {
ent->use( ent, self, activator );
#ifdef G_LUA
if(ent->luaUse != NULL)
if(self->luaUse != NULL) {
LuaHook_G_EntityUse(self->luaUse, self->s.number, other->s.number, self->s.number);
}
#endif
}
}
@ -617,7 +619,7 @@ none
-----KEYS-----
"targetanme" - the activator calling this will be telefragged if client
*/
static void target_kill_use( gentity_t *self, /*@unused@*/ gentity_t *other, gentity_t *activator ) {
static void target_kill_use( /*@shared@*/ gentity_t *self, /*@shared@*/ /*@unused@*/ gentity_t *other, /*@shared@*/ gentity_t *activator ) {
if(activator != NULL) {
G_Damage ( activator, NULL, NULL, NULL, NULL, 100000, DAMAGE_NO_PROTECTION, MOD_TELEFRAG);
}
@ -631,7 +633,7 @@ void SP_target_kill( gentity_t *self ) {
trap_LinkEntity(self);
}
static void target_location_linkup(gentity_t *ent)
static void target_location_linkup(/*@shared@*/ gentity_t *ent)
{
int i;
int n;