X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fprogs.src;h=75301d592972ee3e67ade8b01a84a72c7d188f19;hp=288b2477597c00114d0a3b0246c296f3e1360b51;hb=2f239100c8b77275d69972f91ac4e7ff913f3d7c;hpb=5fcaa5e1251bcbbdedf31d885bdca0b2b75811c7

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 288b247759..75301d5929 100644
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -1,248 +1,122 @@
-../../progs.dat // output filename
+../../progs.dat
 
 ../common/util-pre.qh
 sys-pre.qh
-../dpdefs/progsdefs.qc
-../dpdefs/dpextensions.qc
+../dpdefs/progsdefs.qh
+../dpdefs/dpextensions.qh
 sys-post.qh
 
-../warpzonelib/anglestransform.qh
-../warpzonelib/mathlib.qh
-../warpzonelib/common.qh
-../warpzonelib/util_server.qh
-../warpzonelib/server.qh
-
-../common/constants.qh
-../common/stats.qh
-../common/teams.qh
-../common/util.qh
-../common/nades.qh
-../common/buffs.qh
-../common/test.qh
-../common/counting.qh
-../common/items.qh
-../common/explosion_equation.qh
-../common/urllib.qh
-../common/command/markup.qh
-../common/command/rpn.qh
-../common/command/generic.qh
-../common/command/shared_defs.qh
-../common/net_notice.qh
-../common/animdecide.qh
-../common/monsters/monsters.qh
-../common/monsters/sv_monsters.qh
-../common/monsters/spawn.qh
-
-autocvars.qh
-constants.qh
-defs.qh		// Should rename this, it has fields and globals
-
-../common/notifications.qh // must be after autocvars
-../common/deathtypes.qh // must be after notifications
-
-mutators/mutators_include.qh
-
-//// tZork Turrets ////
-tturrets/include/turrets_early.qh
-vehicles/vehicles_def.qh
-
-campaign.qh
-../common/campaign_common.qh
-../common/mapinfo.qh
-
-command/common.qh
-command/banning.qh
-command/radarmap.qh
-command/vote.qh
-command/getreplies.qh
-command/cmd.qh
-command/sv_cmd.qh
-
-accuracy.qh
-csqcprojectile.qh
-../common/csqcmodel_settings.qh
-../csqcmodellib/common.qh
-../csqcmodellib/sv_model.qh
+anticheat.qc
+antilag.qc
+campaign.qc
+cheats.qc
+cl_client.qc
+cl_impulse.qc
+cl_physics.qc
+cl_player.qc
 csqceffects.qc
-
-anticheat.qh
-cheats.qh
-playerstats.qh
-
-portals.qh
-
-g_hook.qh
-w_electro.qh
-w_laser.qh
-
-scores.qh
-
-spawnpoints.qh
-
-mapvoting.qh
-
-ipban.qh
-
-race.qh
-
-antilag.qh
-
-playerdemo.qh
-
-round_handler.qh
-
-// singleplayer stuff
-item_key.qh
-secret.qh
-
-scores_rules.qc
-
-miscfunctions.qc
-
-mutators/mutators.qc
-
-waypointsprites.qc
-
-bot/bot.qc
-
+ent_cs.qc
+func_breakable.qc
+g_casings.qc
+g_damage.qc
+g_hook.qc
+// g_lights.qc // TODO: was never used
+g_models.qc
 g_subs.qc
-
 g_tetris.qc
-
-//runematch.qc
-
+g_triggers.qc
 g_violence.qc
-g_damage.qc
-
-teamplay.qc
-
-cl_physics.qc
-
-// tZork's libs
-movelib.qc
-steerlib.qc
-pathlib/pathlib.qh
-
 g_world.qc
-g_casings.qc
-
-mapvoting.qc
-
-t_jumppads.qc
-t_teleporters.qc
-
-sv_main.qc
-
-g_triggers.qc
-g_models.qc
-
-// singleplayer stuff
+ipban.qc
 item_key.qc
+mapvoting.qc
+miscfunctions.qc
+movelib.qc
+// pathlib.qc // TODO: was never used. Seems to duplicate `pathlib/`
+playerdemo.qc
+portals.qc
+race.qc
+round_handler.qc
+scores.qc
+scores_rules.qc
 secret.qc
-
-cl_weaponsystem.qc
-w_common.qc
-
-w_all.qc
-
+spawnpoints.qc
+steerlib.qc
+sv_main.qc
+target_music.qc
+target_spawn.qc
+teamplay.qc
+t_halflife.qc
 t_items.qc
-cl_weapons.qc
-cl_impulse.qc
-
-ent_cs.qc
-
-cl_player.qc
-cl_client.qc
+t_jumppads.qc
 t_plats.qc
-antilag.qc
-
-//ctf.qc
-//domination.qc
-//mode_onslaught.qc
-//nexball.qc
-g_hook.qc
-
+t_quake.qc
+t_quake3.qc
 t_swamp.qc
+t_teleporters.qc
+waypointsprites.qc
 
-campaign.qc
-../common/campaign_file.qc
-../common/campaign_setup.qc
-../common/urllib.qc
+bot/aim.qc
+bot/bot.qc
+bot/navigation.qc
+bot/scripting.qc
+bot/waypoints.qc
 
-../common/command/markup.qc
-../common/command/rpn.qc
-../common/command/generic.qc
-../common/net_notice.qc
+bot/havocbot/havocbot.qc
+bot/havocbot/role_keyhunt.qc
+bot/havocbot/role_onslaught.qc
+bot/havocbot/roles.qc
 
-command/common.qc
-command/banning.qc
-command/radarmap.qc
-command/vote.qc
-command/getreplies.qc
-command/cmd.qc
-command/sv_cmd.qc
+command/all.qc
 
-//assault.qc
+mutators/mutators_include.qc
+mutators/mutators.qc
 
-ipban.qc
+pathlib/costs.qc
+pathlib/expandnode.qc
+pathlib/main.qc
+pathlib/movenode.qc
+pathlib/path_waypoint.qc
+pathlib/utility.qc
+
+vehicles/all.qc
+
+weapons/accuracy.qc
+weapons/common.qc
+weapons/csqcprojectile.qc // TODO
+weapons/hitplot.qc
+weapons/selection.qc
+weapons/spawning.qc
+weapons/throwing.qc
+weapons/tracing.qc
+weapons/weaponstats.qc
+weapons/weaponsystem.qc
 
+../common/animdecide.qc
+../common/buffs.qc
+../common/campaign_file.qc
+../common/campaign_setup.qc
 ../common/mapinfo.qc
-
-t_quake3.qc
-t_halflife.qc
-t_quake.qc
-
-race.qc
-
-
-//// tZork Turrets ////
-tturrets/include/turrets.qh
-vehicles/vehicles.qh
-
-scores.qc
-
-spawnpoints.qc
-
-portals.qc
-
-target_spawn.qc
-func_breakable.qc
-target_music.qc
-
-../common/items.qc
-
+../common/monsters/all.qc
+../common/monsters/spawn.qc
+../common/monsters/sv_monsters.qc
 ../common/nades.qc
-../common/buffs.qc
-
-
-accuracy.qc
-../csqcmodellib/sv_model.qc
-csqcprojectile.qc
-
-playerdemo.qc
-
-anticheat.qc
-cheats.qc
-playerstats.qc
-
-round_handler.qc
-
-../common/explosion_equation.qc
+../common/net_notice.qc
+../common/notifications.qc
+../common/playerstats.qc
+../common/test.qc
+../common/urllib.qc
+../common/util.qc
 
-../common/monsters/sv_monsters.qc
-../common/monsters/monsters.qc
+../common/items/all.qc
 
-../common/monsters/spawn.qc
+../common/weapons/config.qc
+../common/weapons/all.qc // TODO
 
-mutators/mutators_include.qc
+../csqcmodellib/sv_model.qc
 
 ../warpzonelib/anglestransform.qc
-../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
-../warpzonelib/util_server.qc
+../warpzonelib/mathlib.qc
 ../warpzonelib/server.qc
-
-../common/animdecide.qc
-../common/test.qc
-../common/util.qc
-../common/notifications.qc
+../warpzonelib/util_server.qc