From 77a72b8a1d5686ac0ee30d5019f512086bcbaf3e Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 2 Aug 2020 22:22:45 +1000 Subject: [PATCH] Remove the g_ prefix from some server code files and rename sv_main to main --- qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc | 4 ++-- qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc | 8 ++++---- qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc | 2 +- .../gamemodes/gamemode/domination/sv_domination.qc | 2 +- .../common/gamemodes/gamemode/invasion/sv_invasion.qc | 2 +- .../common/gamemodes/gamemode/keepaway/sv_keepaway.qc | 4 ++-- qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc | 2 +- qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc | 2 +- .../gamemodes/gamemode/onslaught/sv_onslaught.qc | 2 +- qcsrc/common/gamemodes/gamemode/race/sv_race.qc | 2 +- qcsrc/common/mapobjects/func/breakable.qc | 2 +- qcsrc/common/mapobjects/target/spawn.qc | 2 +- qcsrc/common/mapobjects/teleporters.qc | 2 +- qcsrc/common/mapobjects/trigger/jumppads.qc | 2 +- qcsrc/common/monsters/monster.qh | 2 +- qcsrc/common/monsters/sv_monsters.qc | 6 +++--- .../mutators/mutator/breakablehook/sv_breakablehook.qc | 2 +- qcsrc/common/mutators/mutator/buffs/sv_buffs.qc | 2 +- qcsrc/common/notifications/all.qc | 2 +- qcsrc/common/physics/player.qc | 2 +- qcsrc/common/playerstats.qc | 4 ++-- qcsrc/common/turrets/sv_turrets.qc | 2 +- qcsrc/common/vehicles/sv_vehicles.qc | 6 +++--- qcsrc/common/weapons/all.qc | 2 +- qcsrc/common/weapons/weapon/shockwave.qc | 2 +- qcsrc/server/_mod.inc | 10 ++++------ qcsrc/server/_mod.qh | 10 ++++------ qcsrc/server/anticheat.qc | 2 +- qcsrc/server/bot/default/bot.qc | 4 ++-- qcsrc/server/bot/default/havocbot/havocbot.qc | 2 +- qcsrc/server/campaign.qc | 2 +- qcsrc/server/cheats.qc | 4 ++-- qcsrc/server/client.qc | 8 ++++---- qcsrc/server/clientkill.qc | 2 +- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/command/common.qc | 2 +- qcsrc/server/command/common.qh | 2 +- qcsrc/server/command/getreplies.qc | 4 ++-- qcsrc/server/command/getreplies.qh | 2 +- qcsrc/server/command/radarmap.qc | 2 +- qcsrc/server/command/sv_cmd.qc | 2 +- qcsrc/server/command/vote.qc | 4 ++-- qcsrc/server/command/vote.qh | 2 +- qcsrc/server/{g_damage.qc => damage.qc} | 6 +++--- qcsrc/server/{g_damage.qh => damage.qh} | 2 +- qcsrc/server/{g_hook.qc => hook.qc} | 4 ++-- qcsrc/server/{g_hook.qh => hook.qh} | 0 qcsrc/server/impulse.qc | 2 +- qcsrc/server/items/items.qc | 2 +- qcsrc/server/{sv_main.qc => main.qc} | 8 ++++---- qcsrc/server/{sv_main.qh => main.qh} | 0 qcsrc/server/mapvoting.qc | 2 +- qcsrc/server/miscfunctions.qc | 8 ++++---- qcsrc/server/miscfunctions.qh | 2 +- qcsrc/server/player.qc | 6 +++--- qcsrc/server/portals.qc | 4 ++-- qcsrc/server/race.qc | 4 ++-- qcsrc/server/round_handler.qc | 2 +- qcsrc/server/scores.qc | 2 +- qcsrc/server/spawnpoints.qc | 2 +- qcsrc/server/teamplay.qc | 2 +- qcsrc/server/weapons/accuracy.qc | 2 +- qcsrc/server/weapons/common.qc | 2 +- qcsrc/server/weapons/hitplot.qc | 2 +- qcsrc/server/weapons/throwing.qc | 2 +- qcsrc/server/weapons/tracing.qc | 4 ++-- qcsrc/server/weapons/weaponstats.qc | 2 +- qcsrc/server/weapons/weaponsystem.qc | 4 ++-- qcsrc/server/{g_world.qc => world.qc} | 6 +++--- qcsrc/server/{g_world.qh => world.qh} | 0 70 files changed, 107 insertions(+), 111 deletions(-) rename qcsrc/server/{g_damage.qc => damage.qc} (99%) rename qcsrc/server/{g_damage.qh => damage.qh} (99%) rename qcsrc/server/{g_hook.qc => hook.qc} (99%) rename qcsrc/server/{g_hook.qh => hook.qh} (100%) rename qcsrc/server/{sv_main.qc => main.qc} (99%) rename qcsrc/server/{sv_main.qh => main.qh} (100%) rename qcsrc/server/{g_world.qc => world.qc} (99%) rename qcsrc/server/{g_world.qh => world.qh} (100%) diff --git a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc index 3915429d6..fcfcf32ff 100644 --- a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc +++ b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include .entity sprite; diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc index ec296a9c9..7e4366659 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -2205,7 +2205,7 @@ MUTATOR_HOOKFUNCTION(ctf, PlayerPreThink) WaypointSprite_UpdateHealth(player.wps_flagcarrier, healtharmor_maxdamage(GetResource(player, RES_HEALTH), GetResource(player, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x); } -MUTATOR_HOOKFUNCTION(ctf, Damage_Calculate) // for changing damage and force values that are applied to players in g_damage.qc +MUTATOR_HOOKFUNCTION(ctf, Damage_Calculate) // for changing damage and force values that are applied to players in damage.qc { entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); @@ -2358,7 +2358,7 @@ MUTATOR_HOOKFUNCTION(ctf, PlayerUseKey) if(head != player && SAME_TEAM(head, player)) if(!head.speedrunning && !head.vehicle) { - // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc) + // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in damage.qc) vector head_center = WarpZone_UnTransformOrigin(head, CENTER_OR_VIEWOFS(head)); vector passer_center = CENTER_OR_VIEWOFS(player); diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc index 22d021cf5..1550c8e89 100644 --- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc +++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc index 410d07e8f..0a6ee791a 100644 --- a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc +++ b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc index 09be394fb..d74c2dfc2 100644 --- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc +++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc @@ -6,7 +6,7 @@ #include #include -#include +#include #include IntrusiveList g_invasion_roundends; diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc index 6ce13f2e9..dda6185cf 100644 --- a/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc +++ b/qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include .entity ballcarried; @@ -384,7 +384,7 @@ MUTATOR_HOOKFUNCTION(ka, PlayerUseKey) } } -MUTATOR_HOOKFUNCTION(ka, Damage_Calculate) // for changing damage and force values that are applied to players in g_damage.qc +MUTATOR_HOOKFUNCTION(ka, Damage_Calculate) // for changing damage and force values that are applied to players in damage.qc { entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc index 5e098c67c..d48c76f39 100644 --- a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc index a206fcbde..1b7b527d8 100644 --- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include int autocvar_g_lms_extra_lives; diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index 6bb2387dd..375edafb4 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/common/gamemodes/gamemode/race/sv_race.qc b/qcsrc/common/gamemodes/gamemode/race/sv_race.qc index f56353d01..5c6e52f39 100644 --- a/qcsrc/common/gamemodes/gamemode/race/sv_race.qc +++ b/qcsrc/common/gamemodes/gamemode/race/sv_race.qc @@ -1,7 +1,7 @@ #include "sv_race.qh" #include -#include +#include #include #include #include diff --git a/qcsrc/common/mapobjects/func/breakable.qc b/qcsrc/common/mapobjects/func/breakable.qc index 24d713943..4db651658 100644 --- a/qcsrc/common/mapobjects/func/breakable.qc +++ b/qcsrc/common/mapobjects/func/breakable.qc @@ -1,7 +1,7 @@ #include "breakable.qh" #ifdef SVQC -#include +#include #include #include #include diff --git a/qcsrc/common/mapobjects/target/spawn.qc b/qcsrc/common/mapobjects/target/spawn.qc index 0c607934c..b96370d18 100644 --- a/qcsrc/common/mapobjects/target/spawn.qc +++ b/qcsrc/common/mapobjects/target/spawn.qc @@ -5,7 +5,7 @@ #include #include #include - #include + #include #endif #ifdef SVQC diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc index 24b7fb99c..93bfcbb26 100644 --- a/qcsrc/common/mapobjects/teleporters.qc +++ b/qcsrc/common/mapobjects/teleporters.qc @@ -15,7 +15,7 @@ #include #include #include "../deathtypes/all.qh" - #include + #include #include "../turrets/sv_turrets.qh" #include "../vehicles/all.qh" #include diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc index 66a9499d4..5273179ad 100644 --- a/qcsrc/common/mapobjects/trigger/jumppads.qc +++ b/qcsrc/common/mapobjects/trigger/jumppads.qc @@ -2,7 +2,7 @@ // TODO: split target_push and put it in the target folder #ifdef SVQC #include -#include +#include void trigger_push_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index 146f64d40..5d79c4a83 100644 --- a/qcsrc/common/monsters/monster.qh +++ b/qcsrc/common/monsters/monster.qh @@ -59,7 +59,7 @@ ENDCLASS(Monster) #ifdef SVQC #include "sv_monsters.qh" -#include +#include #include #include #include diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 46bb1593a..d5bff8f02 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -10,12 +10,12 @@ #include #include #include -#include +#include #include "../deathtypes/all.qh" #include #include #include -#include +#include #include "../turrets/sv_turrets.qh" #include "../turrets/util.qh" #include "../vehicles/all.qh" @@ -135,7 +135,7 @@ entity Monster_FindTarget(entity this) { if(Monster_ValidTarget(this, it)) { - // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc) + // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in damage.qc) vector targ_center = CENTER_OR_VIEWOFS(it); if(closest_target) diff --git a/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc b/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc index dc1bfefc2..c80b97d36 100644 --- a/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc +++ b/qcsrc/common/mutators/mutator/breakablehook/sv_breakablehook.qc @@ -1,7 +1,7 @@ #include "sv_breakablehook.qh" #include -#include +#include REGISTER_MUTATOR(breakablehook, cvar("g_breakablehook")); diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 29828a094..30cef339a 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -3,7 +3,7 @@ #include #include #include -#include +#include void buffs_DelayedInit(entity this); diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index c8fb372d6..c46c21722 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -8,7 +8,7 @@ #include #include #include - #include + #include #include #endif diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index af1ae0ad1..ade9c4d6f 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -8,7 +8,7 @@ #include #include #include "../mapobjects/trigger/viewloc.qh" -#include +#include // client side physics bool Physics_Valid(string thecvar) diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index d91e16f47..3b8c97c4b 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -9,7 +9,7 @@ #include "../server/anticheat.qh" #include #include "../server/scores.qh" - #include + #include #include "../server/weapons/accuracy.qh" #endif @@ -296,7 +296,7 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status) * G: game type * O: mod name (icon request) as in server browser * M: map name - * I: match ID (see "matchid" in g_world.qc) + * I: match ID (see "matchid" in world.qc) * S: "hostname" of the server * C: number of "unpure" cvar changes * U: UDP port number of the server diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index 84b0c8249..e2a9ab2e4 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -2,7 +2,7 @@ #ifdef SVQC #include #include -#include +#include #include #include #include diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index 590aba88a..beff57489 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -1,14 +1,14 @@ #include "sv_vehicles.qh" #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include bool SendAuxiliaryXhair(entity this, entity to, int sf) diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 62e4ff0e0..dc87d6b62 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -41,7 +41,7 @@ #include #include #include - #include + #include #endif #ifdef GAMEQC #include "calculations.qc" diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index f38c34b19..accb917f6 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -479,7 +479,7 @@ void W_Shockwave_Attack(Weapon thiswep, entity actor, .entity weaponentity) // BLAST CONE CALCULATION // ======================== - // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc) + // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in damage.qc) center = CENTER_OR_VIEWOFS(head); // find the closest point on the enemy to the center of the attack diff --git a/qcsrc/server/_mod.inc b/qcsrc/server/_mod.inc index 7634e7635..0da2e2be4 100644 --- a/qcsrc/server/_mod.inc +++ b/qcsrc/server/_mod.inc @@ -5,13 +5,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include +#include #include #include #include @@ -24,9 +25,6 @@ #include #include #include -#ifdef SVQC - #include -#endif #include #include diff --git a/qcsrc/server/_mod.qh b/qcsrc/server/_mod.qh index 331fdcd85..67080b368 100644 --- a/qcsrc/server/_mod.qh +++ b/qcsrc/server/_mod.qh @@ -5,13 +5,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include +#include #include #include #include @@ -24,9 +25,6 @@ #include #include #include -#ifdef SVQC - #include -#endif #include #include diff --git a/qcsrc/server/anticheat.qc b/qcsrc/server/anticheat.qc index c0d1cc10e..7e8e50660 100644 --- a/qcsrc/server/anticheat.qc +++ b/qcsrc/server/anticheat.qc @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "miscfunctions.qh" #include "command/common.qh" diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index 9d526b74d..e8f810231 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -18,8 +18,8 @@ #include "../../client.qh" #include "../../constants.qh" #include -#include -#include +#include +#include #include "../../race.qh" #include diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index f6917bdb4..40a07a44c 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index 92d183a45..de46e57d5 100644 --- a/qcsrc/server/campaign.qc +++ b/qcsrc/server/campaign.qc @@ -5,7 +5,7 @@ #include "cheats.qh" #include "miscfunctions.qh" -#include "g_world.qh" +#include "world.qh" #include "../common/campaign_common.qh" diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index dc41fac73..9d5cc1d42 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -5,9 +5,9 @@ #include #include #include -#include +#include -#include "g_damage.qh" +#include "damage.qh" #include "clientkill.qh" #include "player.qh" #include "race.qh" diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 99aa86d24..0a9a38faf 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -13,17 +13,17 @@ #include "teamplay.qh" #include "spawnpoints.qh" #include "resources.qh" -#include "g_damage.qh" +#include "damage.qh" #include "handicap.qh" -#include "g_hook.qh" +#include "hook.qh" #include "command/common.qh" #include "command/vote.qh" #include "clientkill.qh" #include "cheats.qh" -#include "g_world.qh" +#include "world.qh" #include #include "race.qh" -#include +#include #include "antilag.qh" #include "campaign.qh" #include "command/common.qh" diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc index 600faed5a..73ccb383d 100644 --- a/qcsrc/server/clientkill.qc +++ b/qcsrc/server/clientkill.qc @@ -5,7 +5,7 @@ #include #include -#include "g_damage.qh" +#include "damage.qh" #include "teamplay.qh" #include diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 815c5e23f..fe92d3667 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,6 +1,6 @@ #include "cmd.qh" -#include +#include #include #include diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 48f1cd168..0f59802dd 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index ea3af5469..c9aad4b79 100644 --- a/qcsrc/server/command/common.qh +++ b/qcsrc/server/command/common.qh @@ -54,7 +54,7 @@ float timeout_status; // (values: 0, 1, 2) contains whether a timeout is not .float allowed_timeouts; // contains the number of allowed timeouts for each player .vector lastV_angle; // used when pausing the game in order to force the player to keep his old view angle fixed -// allow functions to be used in other code like g_world.qc and teamplay.qc +// allow functions to be used in other code like world.qc and teamplay.qc void timeout_handler_think(entity this); // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index c5a26e8c9..326297489 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -22,7 +22,7 @@ // Last updated: December 30th, 2011 // ========================================================= -// These strings are set usually during init in g_world.qc, +// These strings are set usually during init in world.qc, // or also by some game modes or other functions manually, // and their purpose is to output information to clients // without using any extra processing time. diff --git a/qcsrc/server/command/getreplies.qh b/qcsrc/server/command/getreplies.qh index 7b4360792..3ababeec5 100644 --- a/qcsrc/server/command/getreplies.qh +++ b/qcsrc/server/command/getreplies.qh @@ -13,7 +13,7 @@ const int LADDER_SIZE = 30; // ladder shows the top X players string top_uids[LADDER_SIZE]; float top_scores[LADDER_SIZE]; -// allow functions to be used in other code like g_world.qc and race.qc +// allow functions to be used in other code like world.qc and race.qc string getrecords(float page); string getrankings(); string getladder(); diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 7ec8eb6ea..6e73777a0 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -4,7 +4,7 @@ #include #include -#include "../g_world.qh" +#include "../world.qh" #include diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 034bd6cb9..7de740bdd 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -13,7 +13,7 @@ #include "../campaign.qh" #include "../client.qh" #include "../player.qh" -#include "../g_world.qh" +#include "../world.qh" #include "../ipban.qh" #include "../teamplay.qh" diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 2ad5c0510..ee8a8e8db 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -11,8 +11,8 @@ #include "common.qh" -#include "../g_damage.qh" -#include "../g_world.qh" +#include "../damage.qh" +#include "../world.qh" #include "../teamplay.qh" #include "../race.qh" #include "../round_handler.qh" diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh index 55068ab46..7085ca0e1 100644 --- a/qcsrc/server/command/vote.qh +++ b/qcsrc/server/command/vote.qh @@ -38,7 +38,7 @@ string vote_called_display; // visual string of command sent by client string vote_parsed_command; // command which is fixed after being parsed string vote_parsed_display; // visual string which is fixed after being parsed -// allow functions to be used in other code like g_world.qc and teamplay.qc +// allow functions to be used in other code like world.qc and teamplay.qc void VoteThink(); void VoteReset(); void VoteCommand(int request, entity caller, int argc, string vote_command); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/damage.qc similarity index 99% rename from qcsrc/server/g_damage.qc rename to qcsrc/server/damage.qc index f5d5f91bc..f799e96f7 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/damage.qc @@ -1,13 +1,13 @@ -#include "g_damage.qh" +#include "damage.qh" #include #include "bot/api.qh" -#include "g_hook.qh" +#include "hook.qh" #include #include #include #include -#include +#include #include "teamplay.qh" #include "scores.qh" #include "spawnpoints.qh" diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/damage.qh similarity index 99% rename from qcsrc/server/g_damage.qh rename to qcsrc/server/damage.qh index 2348c7ad6..14dbaf074 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/damage.qh @@ -24,7 +24,7 @@ #include #include #include - #include "g_hook.qh" + #include "hook.qh" #include "scores.qh" #include "spawnpoints.qh" #endif diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/hook.qc similarity index 99% rename from qcsrc/server/g_hook.qc rename to qcsrc/server/hook.qc index 57947200a..6042a48e1 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/hook.qc @@ -1,9 +1,9 @@ -#include "g_hook.qh" +#include "hook.qh" #include #include #include -#include +#include #include #include #include "weapons/common.qh" diff --git a/qcsrc/server/g_hook.qh b/qcsrc/server/hook.qh similarity index 100% rename from qcsrc/server/g_hook.qh rename to qcsrc/server/hook.qh diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index 521c2223f..779384d70 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -6,7 +6,7 @@ #include "cheats.qh" #include "client.qh" #include "clientkill.qh" -#include "g_damage.qh" +#include "damage.qh" #include "weapons/selection.qh" #include "weapons/tracing.qh" #include "weapons/weaponsystem.qh" diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index 44cd6ba28..861b21eed 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -6,7 +6,7 @@ #include -#include +#include #include diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/main.qc similarity index 99% rename from qcsrc/server/sv_main.qc rename to qcsrc/server/main.qc index 4969c5105..bbafd022d 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/main.qc @@ -1,9 +1,9 @@ -#include "sv_main.qh" +#include "main.qh" #include "anticheat.qh" -#include "g_hook.qh" -#include "g_damage.qh" -#include "g_world.qh" +#include "hook.qh" +#include "damage.qh" +#include "world.qh" #include "spawnpoints.qh" #include diff --git a/qcsrc/server/sv_main.qh b/qcsrc/server/main.qh similarity index 100% rename from qcsrc/server/sv_main.qh rename to qcsrc/server/main.qh diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc index 2286b60a4..ac64f630f 100644 --- a/qcsrc/server/mapvoting.qc +++ b/qcsrc/server/mapvoting.qc @@ -5,7 +5,7 @@ #include #include #include -#include "g_world.qh" +#include "world.qh" #include "command/cmd.qh" #include "command/getreplies.qh" #include "../common/constants.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 76dcf8491..1a751984d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -4,15 +4,15 @@ #include "command/common.qh" #include "client.qh" #include "constants.qh" -#include "g_damage.qh" -#include "g_hook.qh" -#include "g_world.qh" +#include "damage.qh" +#include "hook.qh" +#include "world.qh" #include #include "ipban.qh" #include #include #include -#include +#include #include "mapvoting.qh" #include "resources.qh" #include diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 6d317a71c..8a2406316 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index ba19f16a7..ef6045403 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -5,13 +5,13 @@ #include "cheats.qh" #include "client.qh" #include "clientkill.qh" -#include "g_damage.qh" -#include "g_world.qh" +#include "damage.qh" +#include "world.qh" #include "handicap.qh" #include "miscfunctions.qh" #include "portals.qh" #include "teamplay.qh" -#include +#include #include "weapons/common.qh" #include "weapons/throwing.qh" #include "command/common.qh" diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 7edbc6f99..7abe6ae97 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -1,7 +1,7 @@ #include "portals.qh" #include -#include "g_hook.qh" +#include "hook.qh" #include "mutators/_mod.qh" #include #include @@ -21,7 +21,7 @@ #include "../common/vehicles/sv_vehicles.qh" #include #include -#include +#include #define PORTALS_ARE_NOT_SOLID diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 7b99d916a..c2de3c9cc 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include #include #include "client.qh" diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index aab069cba..66da6c37c 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -1,6 +1,6 @@ #include "round_handler.qh" -#include +#include #include #include "campaign.qh" #include "command/vote.qh" diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 18bb5f76c..e4e1d236a 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -3,7 +3,7 @@ #include "command/common.qh" #include #include "client.qh" -#include +#include #include #include #include diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index 9884ec75e..b629ef168 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -1,7 +1,7 @@ #include "spawnpoints.qh" #include -#include "g_world.qh" +#include "world.qh" #include "miscfunctions.qh" #include "race.qh" #include diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index ce41941c5..1c436da96 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -2,7 +2,7 @@ #include "client.qh" #include -#include +#include #include "race.qh" #include "scores.qh" #include "scores_rules.qh" diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index 0b895ea37..2ec4fc710 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index 4c9f78422..7cd56faa7 100644 --- a/qcsrc/server/weapons/common.qc +++ b/qcsrc/server/weapons/common.qc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc index eca09ebaa..0407ad799 100644 --- a/qcsrc/server/weapons/hitplot.qc +++ b/qcsrc/server/weapons/hitplot.qc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include "../antilag.qh" #include diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 395bfb9b1..2408adbf1 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -5,7 +5,7 @@ #include #include #include -#include "../g_damage.qh" +#include "../damage.qh" #include #include #include diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 2d9972551..f4de0e1bf 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -7,8 +7,8 @@ #include "hitplot.qh" #include "weaponsystem.qh" -#include "../g_damage.qh" -#include +#include "../damage.qh" +#include #include "../antilag.qh" #include diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc index eadd6f4bc..552ab6731 100644 --- a/qcsrc/server/weapons/weaponstats.qc +++ b/qcsrc/server/weapons/weaponstats.qc @@ -3,7 +3,7 @@ #include #include #include -#include "../g_world.qh" +#include "../world.qh" #include diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 81b25e845..763881388 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -4,8 +4,8 @@ #include "../command/common.qh" #include -#include -#include +#include +#include #include #include #include "../round_handler.qh" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/world.qc similarity index 99% rename from qcsrc/server/g_world.qc rename to qcsrc/server/world.qc index e258e351a..c9fec23b8 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/world.qc @@ -1,4 +1,4 @@ -#include "g_world.qh" +#include "world.qh" #include "anticheat.qh" #include "antilag.qh" @@ -10,9 +10,9 @@ #include "command/getreplies.qh" #include "command/sv_cmd.qh" #include "command/vote.qh" -#include "g_hook.qh" +#include "hook.qh" #include -#include +#include #include "ipban.qh" #include "mapvoting.qh" #include diff --git a/qcsrc/server/g_world.qh b/qcsrc/server/world.qh similarity index 100% rename from qcsrc/server/g_world.qh rename to qcsrc/server/world.qh -- 2.39.2