ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-02-21 11:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

added annotations

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-05-24 19:36:05 +02:00
parent eb7e630a8c
commit cc41dcdcd1
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
code/game/g_local.h
View file

@ -241,9 +241,9 @@ struct gentity_s {
int sound2to1; //!< soundindex of sound to play when moving from Pos2 to Pos1
int soundPos2; //!< soundindex of sound to play when reaching Pos2
int soundLoop; //!< soundindex for looped sounds
gentity_t* parent; //!< parent of this entity
gentity_t* nextTrain; //!< next path_corner of a func_train
gentity_t* prevTrain; //!< previous path_corner of a func_train
/*@shared@*/ /*@null@*/ gentity_t* parent; //!< parent of this entity
/*@shared@*/ /*@null@*/ gentity_t* nextTrain; //!< next path_corner of a func_train
/*@shared@*/ /*@null@*/ gentity_t* prevTrain; //!< previous path_corner of a func_train
vec3_t pos1; //!< start position for binary movers
vec3_t pos2; //!< end position for binary movers
vec3_t apos1; //!< angular start position for movers
@ -258,7 +258,7 @@ struct gentity_s {
char* paintarget; //!< target to use if entity takes damage
char* targetname; //!< targetname that identyfies the entity
char* team; //!< for teamchains
gentity_t* target_ent; //!< target of turrets etc
/*@shared@*/ /*@null@*/ gentity_t* target_ent; //!< target of turrets etc
float speed; //!< moving speed etc
vec3_t movedir; //!< moving direction
@ -291,11 +291,11 @@ struct gentity_s {
int count; //!< used for counting, check whether an entity is allowed to use
//!< and other various things
gentity_t* lastEnemy; //!< last enemy of the entity (turrets etc)
gentity_t* enemy; //!< current enemy of the entity (turrets etc)
gentity_t* activator; //!< entity that activated/used this entity
gentity_t* teamchain; //!< next entity in team
gentity_t* teammaster; //!< master of the team
/*@shared@*/ /*@null@*/ gentity_t* lastEnemy; //!< last enemy of the entity (turrets etc)
/*@shared@*/ /*@null@*/ gentity_t* enemy; //!< current enemy of the entity (turrets etc)
/*@shared@*/ /*@null@*/ gentity_t* activator; //!< entity that activated/used this entity
/*@shared@*/ /*@null@*/ gentity_t* teamchain; //!< next entity in team
/*@shared@*/ /*@null@*/ gentity_t* teammaster; //!< master of the team
int watertype;
int waterlevel;
@ -309,7 +309,7 @@ struct gentity_s {
float wait; //!< how long to wait
float random;
gitem_t* item; //!< for bonus items
/*@shared@*/ /*@null@*/ gitem_t* item; //!< for bonus items
qboolean botDelayBegin;
@ -327,7 +327,7 @@ struct gentity_s {
//RPG-X: TiM : Additional Params for map ents
char* targetname2; // GSIO01 | 08/05/2009
gentity_t* touched; // GSIO01 | 08/05/2009 repairing breakables
/*@shared@*/ /*@null@*/ gentity_t* touched; // GSIO01 | 08/05/2009 repairing breakables
//GSIO01 | 10/05/2009 | ok these are for target_alert:
char* bluename;

3
code/game/g_main.c
View file

@ -1531,8 +1531,7 @@ static void G_FindTeams( void ) {
c = 0;
c2 = 0;
e=g_entities+i;
for ( i=1; i < level.num_entities ; i++,e++ ){
for ( i=1, e=g_entities+i ; i < level.num_entities ; i++,e++ ){
if (!e->inuse)
continue;
if (!e->team)