summaryrefslogtreecommitdiff
path: root/src/game/g_spawn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/g_spawn.c')
-rw-r--r--src/game/g_spawn.c98
1 files changed, 50 insertions, 48 deletions
diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index f5790024..00d618c3 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.c
@@ -208,6 +208,7 @@ void SP_shooter_grenade( gentity_t *ent );
//TA:
void SP_misc_spriter( gentity_t *ent );
+void SP_misc_particle_system( gentity_t *ent );
void SP_misc_anim_model( gentity_t *ent );
void SP_misc_light_flare( gentity_t *ent );
@@ -215,67 +216,68 @@ spawn_t spawns[ ] =
{
// info entities don't do anything at all, but provide positional
// information for things controlled by other processes
- {"info_player_start", SP_info_player_start},
- {"info_player_deathmatch", SP_info_player_deathmatch},
- {"info_player_intermission", SP_info_player_intermission},
+ { "info_player_start", SP_info_player_start },
+ { "info_player_deathmatch", SP_info_player_deathmatch },
+ { "info_player_intermission", SP_info_player_intermission },
//TA: extra bits
- {"info_alien_intermission", SP_info_alien_intermission},
- {"info_human_intermission", SP_info_human_intermission},
+ { "info_alien_intermission", SP_info_alien_intermission },
+ { "info_human_intermission", SP_info_human_intermission },
- {"info_null", SP_info_null},
- {"info_notnull", SP_info_notnull}, // use target_position instead
-
- {"func_plat", SP_func_plat},
- {"func_button", SP_func_button},
- {"func_door", SP_func_door},
- {"func_door_rotating", SP_func_door_rotating}, //TA
- {"func_door_model", SP_func_door_model}, //TA
- {"func_static", SP_func_static},
- {"func_rotating", SP_func_rotating},
- {"func_bobbing", SP_func_bobbing},
- {"func_pendulum", SP_func_pendulum},
- {"func_train", SP_func_train},
- {"func_group", SP_info_null},
- {"func_timer", SP_func_timer}, // rename trigger_timer?
+ { "info_null", SP_info_null },
+ { "info_notnull", SP_info_notnull }, // use target_position instead
+
+ { "func_plat", SP_func_plat },
+ { "func_button", SP_func_button },
+ { "func_door", SP_func_door },
+ { "func_door_rotating", SP_func_door_rotating }, //TA
+ { "func_door_model", SP_func_door_model }, //TA
+ { "func_static", SP_func_static },
+ { "func_rotating", SP_func_rotating },
+ { "func_bobbing", SP_func_bobbing },
+ { "func_pendulum", SP_func_pendulum },
+ { "func_train", SP_func_train },
+ { "func_group", SP_info_null },
+ { "func_timer", SP_func_timer }, // rename trigger_timer?
// Triggers are brush objects that cause an effect when contacted
// by a living player, usually involving firing targets.
// While almost everything could be done with
// a single trigger class and different targets, triggered effects
// could not be client side predicted (push and teleport).
- {"trigger_always", SP_trigger_always},
- {"trigger_multiple", SP_trigger_multiple},
- {"trigger_push", SP_trigger_push},
- {"trigger_teleport", SP_trigger_teleport},
- {"trigger_hurt", SP_trigger_hurt},
+ { "trigger_always", SP_trigger_always },
+ { "trigger_multiple", SP_trigger_multiple },
+ { "trigger_push", SP_trigger_push },
+ { "trigger_teleport", SP_trigger_teleport },
+ { "trigger_hurt", SP_trigger_hurt },
// targets perform no action by themselves, but must be triggered
// by another entity
- {"target_delay", SP_target_delay},
- {"target_speaker", SP_target_speaker},
- {"target_print", SP_target_print},
- {"target_score", SP_target_score},
- {"target_teleporter", SP_target_teleporter},
- {"target_relay", SP_target_relay},
- {"target_kill", SP_target_kill},
- {"target_position", SP_target_position},
- {"target_location", SP_target_location},
- {"target_push", SP_target_push},
-
- {"light", SP_light},
- {"path_corner", SP_path_corner},
-
- {"misc_teleporter_dest", SP_misc_teleporter_dest},
- {"misc_model", SP_misc_model},
- {"misc_portal_surface", SP_misc_portal_surface},
- {"misc_portal_camera", SP_misc_portal_camera},
-
- {"misc_spriter", SP_misc_spriter},
- {"misc_anim_model", SP_misc_anim_model},
- {"misc_light_flare", SP_misc_light_flare},
+ { "target_delay", SP_target_delay },
+ { "target_speaker", SP_target_speaker },
+ { "target_print", SP_target_print },
+ { "target_score", SP_target_score },
+ { "target_teleporter", SP_target_teleporter },
+ { "target_relay", SP_target_relay },
+ { "target_kill", SP_target_kill },
+ { "target_position", SP_target_position },
+ { "target_location", SP_target_location },
+ { "target_push", SP_target_push },
+
+ { "light", SP_light },
+ { "path_corner", SP_path_corner },
+
+ { "misc_teleporter_dest", SP_misc_teleporter_dest },
+ { "misc_model", SP_misc_model },
+ { "misc_portal_surface", SP_misc_portal_surface },
+ { "misc_portal_camera", SP_misc_portal_camera },
+
+ { "misc_spriter", SP_misc_spriter },
+ { "misc_particle_system", SP_misc_particle_system },
+ { "misc_anim_model", SP_misc_anim_model },
+ { "misc_light_flare", SP_misc_light_flare },
- {0, 0}
+ { 0, 0 }
};
/*