mirror of
https://github.com/UberGames/rpgxEF.git
synced 2025-04-22 08:50:48 +00:00
annotations and fixes
This commit is contained in:
Walter Julius Hennecke
parent
6fdd210d8e
commit
7f30f4cf93
4 changed files with 104 additions and 104 deletions
|
|
@ -1086,7 +1086,7 @@ qboolean G_MoveBox (gentity_t* ent);
|
|||
*
|
||||
* \return an entity or NULL
|
||||
*/
|
||||
/*@shared@*/ /*@null@*/ gentity_t* G_PickTarget (char* targetname);
|
||||
/*@shared@*/ /*@null@*/ gentity_t* G_PickTarget (/*@null@*/ char* targetname);
|
||||
|
||||
/**
|
||||
* \brief Use all of the given entity's targets.
|
||||
|
|
|
|||
|
|
@ -27,134 +27,134 @@ typedef struct
|
|||
int flags;
|
||||
} field_t;
|
||||
|
||||
void SP_info_player_deathmatch (gentity_t *ent);
|
||||
void SP_info_player_intermission (gentity_t *ent);
|
||||
void SP_info_firstplace(gentity_t *ent);
|
||||
void SP_info_secondplace(gentity_t *ent);
|
||||
void SP_info_thirdplace(gentity_t *ent);
|
||||
void SP_info_podium(gentity_t *ent);
|
||||
void SP_info_player_deathmatch(/*@shared@*/ gentity_t *ent);
|
||||
void SP_info_player_intermission(/*@shared@*/ gentity_t *ent);
|
||||
void SP_info_firstplace(/*@shared@*/ gentity_t *ent);
|
||||
void SP_info_secondplace(/*@shared@*/ gentity_t *ent);
|
||||
void SP_info_thirdplace(/*@shared@*/ gentity_t *ent);
|
||||
void SP_info_podium(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
void SP_func_plat (gentity_t *ent);
|
||||
void SP_func_forcefield (gentity_t *ent);
|
||||
void SP_func_static (gentity_t *ent);
|
||||
void SP_func_rotating (gentity_t *ent);
|
||||
void SP_func_bobbing (gentity_t *ent);
|
||||
void SP_func_pendulum( gentity_t *ent );
|
||||
void SP_func_button (gentity_t *ent);
|
||||
void SP_func_door (gentity_t *ent);
|
||||
void SP_func_train (gentity_t *ent);
|
||||
void SP_func_timer (gentity_t *self);
|
||||
void SP_func_usable (gentity_t *self);
|
||||
void SP_func_breakable (gentity_t *self);
|
||||
void SP_func_door_rotating (gentity_t *ent);
|
||||
void SP_func_brushmodel(gentity_t *ent); // for brushmodel hijacking :D
|
||||
void SP_func_lightchange(gentity_t *ent); // "toggling" light
|
||||
void SP_func_targetmover(gentity_t *ent);
|
||||
void SP_func_stasis_door(gentity_t *ent);
|
||||
void SP_func_plat (/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_forcefield(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_static(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_rotating(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_bobbing(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_pendulum(/*@shared@*/ gentity_t *ent );
|
||||
void SP_func_button(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_door(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_train(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_timer(/*@shared@*/ gentity_t *self);
|
||||
void SP_func_usable(/*@shared@*/ gentity_t *self);
|
||||
void SP_func_breakable(/*@shared@*/ gentity_t *self);
|
||||
void SP_func_door_rotating(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_brushmodel(/*@shared@*/ gentity_t *ent); // for brushmodel hijacking :D
|
||||
void SP_func_lightchange(/*@shared@*/ gentity_t *ent); // "toggling" light
|
||||
void SP_func_targetmover(/*@shared@*/ gentity_t *ent);
|
||||
void SP_func_stasis_door(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
void SP_trigger_always (gentity_t *ent);
|
||||
void SP_trigger_multiple (gentity_t *ent);
|
||||
void SP_trigger_push (gentity_t *ent);
|
||||
void SP_trigger_teleport (gentity_t *ent);
|
||||
void SP_trigger_hurt (gentity_t *ent);
|
||||
void SP_trigger_transporter (gentity_t *ent);
|
||||
void SP_trigger_radiation( gentity_t *ent );
|
||||
void SP_trigger_always(/*@shared@*/ gentity_t *ent);
|
||||
void SP_trigger_multiple(/*@shared@*/ gentity_t *ent);
|
||||
void SP_trigger_push(/*@shared@*/ gentity_t *ent);
|
||||
void SP_trigger_teleport(/*@shared@*/ gentity_t *ent);
|
||||
void SP_trigger_hurt(/*@shared@*/ gentity_t *ent);
|
||||
void SP_trigger_transporter(/*@shared@*/ gentity_t *ent);
|
||||
void SP_trigger_radiation(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
void SP_target_remove_powerups( gentity_t *ent );
|
||||
void SP_target_give (gentity_t *ent);
|
||||
void SP_target_delay (gentity_t *ent);
|
||||
void SP_target_speaker (gentity_t *ent);
|
||||
void SP_target_print (gentity_t *ent);
|
||||
void SP_target_laser (gentity_t *self);
|
||||
void SP_target_character (gentity_t *ent);
|
||||
void SP_target_teleporter( gentity_t *ent );
|
||||
void SP_target_relay (gentity_t *ent);
|
||||
void SP_target_kill (gentity_t *ent);
|
||||
void SP_target_location (gentity_t *ent);
|
||||
void SP_target_push (gentity_t *ent);
|
||||
void SP_target_counter (gentity_t *self);
|
||||
void SP_target_objective (gentity_t *self);
|
||||
void SP_target_boolean (gentity_t *ent); //RPG-X | Phenix | 13/06/2004
|
||||
void SP_target_gravity (gentity_t *ent); //RPG-X | Phenix | 13/06/2004
|
||||
void SP_target_shake (gentity_t *ent); //RPG-X | Phenix | 16/11/2004
|
||||
void SP_target_evosuit (gentity_t *ent); //RPG-X | Phenix | 16/11/2004
|
||||
void SP_target_turbolift ( gentity_t *ent); //RPG-X | TiM
|
||||
void SP_target_doorLock ( gentity_t *ent); //RPG-X | GSIO01 | 08/05/2009
|
||||
void SP_target_repair ( gentity_t *ent); //RPG-X | GSIO01 | 09/05/2009
|
||||
void SP_target_alert(gentity_t *ent); //RPG-X | GSIO01 | 11/05/2009
|
||||
void SP_target_warp(gentity_t *ent); //RPG-X | GSIO01 | 19/05/2009
|
||||
void SP_target_deactivate(gentity_t *ent);
|
||||
void SP_target_serverchange(gentity_t *ent);
|
||||
void SP_target_levelchange(gentity_t *ent);
|
||||
void SP_target_shaderremap(gentity_t *ent);
|
||||
void SP_target_selfdestruct(gentity_t *ent);
|
||||
void SP_target_zone(gentity_t *ent);
|
||||
void SP_target_shiphealth(gentity_t *ent);
|
||||
void SP_target_remove_powerups(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_give(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_delay(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_speaker(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_print(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_laser(/*@shared@*/ gentity_t *self);
|
||||
void SP_target_character(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_teleporter(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_relay(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_kill(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_location(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_push(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_counter(/*@shared@*/ gentity_t *self);
|
||||
void SP_target_objective(/*@shared@*/ gentity_t *self);
|
||||
void SP_target_boolean(/*@shared@*/ gentity_t *ent); //RPG-X | Phenix | 13/06/2004
|
||||
void SP_target_gravity(/*@shared@*/ gentity_t *ent); //RPG-X | Phenix | 13/06/2004
|
||||
void SP_target_shake(/*@shared@*/ gentity_t *ent); //RPG-X | Phenix | 16/11/2004
|
||||
void SP_target_evosuit(/*@shared@*/ gentity_t *ent); //RPG-X | Phenix | 16/11/2004
|
||||
void SP_target_turbolift(/*@shared@*/ gentity_t *ent); //RPG-X | TiM
|
||||
void SP_target_doorLock(/*@shared@*/ gentity_t *ent); //RPG-X | GSIO01 | 08/05/2009
|
||||
void SP_target_repair(/*@shared@*/ gentity_t *ent); //RPG-X | GSIO01 | 09/05/2009
|
||||
void SP_target_alert(/*@shared@*/ gentity_t *ent); //RPG-X | GSIO01 | 11/05/2009
|
||||
void SP_target_warp(/*@shared@*/ gentity_t *ent); //RPG-X | GSIO01 | 19/05/2009
|
||||
void SP_target_deactivate(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_serverchange(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_levelchange(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_shaderremap(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_selfdestruct(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_zone(/*@shared@*/ gentity_t *ent);
|
||||
void SP_target_shiphealth(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
void SP_light (gentity_t *self);
|
||||
void SP_info_null (gentity_t *self);
|
||||
void SP_info_notnull (gentity_t *self);
|
||||
void SP_info_camp (gentity_t *self);
|
||||
void SP_path_corner (gentity_t *self);
|
||||
void SP_light(/*@shared@*/ gentity_t *self);
|
||||
void SP_info_null(/*@shared@*/ gentity_t *self);
|
||||
void SP_info_notnull(/*@shared@*/ gentity_t *self);
|
||||
void SP_info_camp(/*@shared@*/ gentity_t *self);
|
||||
void SP_path_corner(/*@shared@*/ gentity_t *self);
|
||||
|
||||
void SP_misc_model(gentity_t *ent);
|
||||
void SP_misc_model_breakable(gentity_t *ent);
|
||||
void SP_misc_portal_camera(gentity_t *ent);
|
||||
void SP_misc_portal_surface(gentity_t *ent);
|
||||
void SP_misc_turret(gentity_t *base);
|
||||
void SP_laser_arm(gentity_t *base);
|
||||
void SP_misc_ammo_station( gentity_t *ent );
|
||||
void SP_misc_model(/*@shared@*/ gentity_t *ent);
|
||||
void SP_misc_model_breakable(/*@shared@*/ gentity_t *ent);
|
||||
void SP_misc_portal_camera(/*@shared@*/ gentity_t *ent);
|
||||
void SP_misc_portal_surface(/*@shared@*/ gentity_t *ent);
|
||||
void SP_misc_turret(/*@shared@*/ gentity_t *base);
|
||||
void SP_laser_arm(/*@shared@*/ gentity_t *base);
|
||||
void SP_misc_ammo_station(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
void SP_shooter_rocket( gentity_t *ent );
|
||||
void SP_shooter_plasma( gentity_t *ent );
|
||||
void SP_shooter_grenade( gentity_t *ent );
|
||||
void SP_shooter_torpedo( gentity_t *ent );
|
||||
void SP_shooter_rocket(/*@shared@*/ gentity_t *ent);
|
||||
void SP_shooter_plasma(/*@shared@*/ gentity_t *ent);
|
||||
void SP_shooter_grenade(/*@shared@*/ gentity_t *ent);
|
||||
void SP_shooter_torpedo(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
// extra Trek stuff
|
||||
void SP_fx_spark ( gentity_t *ent );
|
||||
void SP_fx_steam ( gentity_t *ent );
|
||||
void SP_fx_bolt ( gentity_t *ent );
|
||||
void SP_fx_transporter( gentity_t *ent );
|
||||
void SP_fx_drip( gentity_t *ent );
|
||||
void SP_fx_spark (/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_steam (/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_bolt (/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_transporter(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_drip(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
//RPG-X - TiM: SP ripped visual FX
|
||||
void SP_fx_fountain ( gentity_t *ent );
|
||||
void SP_fx_surface_explosion ( gentity_t *ent );
|
||||
void SP_fx_blow_chunks( gentity_t *ent );
|
||||
void SP_fx_smoke( gentity_t *ent );
|
||||
void SP_fx_electrical_explosion( gentity_t *ent );
|
||||
void SP_fx_fountain(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_surface_explosion(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_blow_chunks(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_smoke(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_electrical_explosion(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
//RPG-X | RPG-X | 09/05/2009: additional Trek fx
|
||||
void SP_fx_phaser(gentity_t *ent);
|
||||
void SP_fx_torpedo( gentity_t *ent );
|
||||
void SP_fx_phaser(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_torpedo(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
//RPG-X | RPG-X | 01/07/2009: additional fx
|
||||
void SP_fx_particleFire(gentity_t *ent);
|
||||
void SP_fx_fire(gentity_t *ent);
|
||||
void SP_fx_particleFire(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_fire(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
// Additional ports from SP by Harry Young
|
||||
void SP_fx_cooking_steam( gentity_t *ent );
|
||||
void SP_fx_electricfire( gentity_t *ent );
|
||||
void SP_fx_cooking_steam(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_electricfire(/*@shared@*/ gentity_t *ent);
|
||||
//void SP_fx_forge_bolt( gentity_t *ent );
|
||||
//void SP_fx_plasma( gentity_t *ent );
|
||||
//void SP_fx_stream( gentity_t *ent );
|
||||
//void SP_fx_transporter_stream( gentity_t *ent );
|
||||
//void SP_fx_explosion_trail( gentity_t *ent );
|
||||
//void SP_fx_borg_energy_beam( gentity_t *ent );
|
||||
void SP_fx_shimmery_thing( gentity_t *ent );
|
||||
void SP_fx_borg_bolt( gentity_t *ent );
|
||||
void SP_fx_shimmery_thing(/*@shared@*/ gentity_t *ent);
|
||||
void SP_fx_borg_bolt(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
// new mover
|
||||
void SP_func_mover(gentity_t *ent);
|
||||
void SP_path_point(gentity_t *ent);
|
||||
void SP_func_mover(/*@shared@*/ gentity_t *ent);
|
||||
void SP_path_point(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
// ui entities
|
||||
void SP_ui_transporter(gentity_t *ent);
|
||||
void SP_ui_msd(gentity_t *ent);
|
||||
void SP_ui_holodeck(gentity_t *ent);
|
||||
void SP_ui_transporter(/*@shared@*/ gentity_t *ent);
|
||||
void SP_ui_msd(/*@shared@*/ gentity_t *ent);
|
||||
void SP_ui_holodeck(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
// cinematic entities
|
||||
void SP_cinematic_camera(gentity_t *ent);
|
||||
void SP_cinematic_camera(/*@shared@*/ gentity_t *ent);
|
||||
|
||||
#endif /* _G_SPAWN_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ static void target_laser_start (/*@shared@*/ gentity_t *self)
|
|||
}
|
||||
}
|
||||
|
||||
void SP_target_laser (/*@shared@*/ gentity_t *self)
|
||||
void SP_target_laser (gentity_t *self)
|
||||
{
|
||||
// let everything else get spawned before we start firing
|
||||
self->think = target_laser_start;
|
||||
|
|
@ -558,7 +558,7 @@ It is also a nice function-caller via luaUse.
|
|||
"luaUse" - lua function to call on use
|
||||
*/
|
||||
|
||||
static void target_relay_use (gentity_t *self, /*@unused@*/ gentity_t *other, gentity_t *activator) {
|
||||
static void target_relay_use (/*@shared@*/ gentity_t *self, /*@shared@*/ /*@unused@*/ gentity_t *other, /*@shared@*/ gentity_t *activator) {
|
||||
if ( ( self->spawnflags & 1 ) != 0 && activator != NULL && activator->client != NULL
|
||||
&& activator->client->sess.sessionTeam != TEAM_RED ) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ gentity_t *G_Find (gentity_t *from, size_t fieldofs, const char *match)
|
|||
/** Maximum number of possible choices for G_PickTarget. */
|
||||
#define MAXCHOICES 32
|
||||
|
||||
gentity_t *G_PickTarget (/*@null@*/ char *targetname)
|
||||
gentity_t *G_PickTarget (char *targetname)
|
||||
{
|
||||
gentity_t *ent = NULL;
|
||||
int num_choices = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue