From: TimePath Date: Sun, 23 Aug 2015 08:56:02 +0000 (+1000) Subject: Merge branch 'master' into Mario/turrets X-Git-Tag: xonotic-v0.8.2~2052^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=25e5c49d0236dfc40abc562ca0cd24a78f8c8deb Merge branch 'master' into Mario/turrets # Conflicts: # qcsrc/client/progs.src # qcsrc/common/monsters/sv_monsters.qc # qcsrc/common/triggers/teleporters.qc # qcsrc/common/vehicles/sv_vehicles.qh # qcsrc/server/g_damage.qc # qcsrc/server/g_damage.qh # qcsrc/server/mutators/mutators_include.qc --- 25e5c49d0236dfc40abc562ca0cd24a78f8c8deb diff --cc qcsrc/client/progs.src index 49b5640ae,88eba6d4b..6a427b464 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@@ -55,15 -56,12 +55,15 @@@ weapons/projectile.qc // TOD ../common/viewloc.qc - ../common/weapons/all.qc // TODO - ../common/items/all.qc - ../common/monsters/all.qc + ../common/mutators/all.qc + ../common/vehicles/all.qc + ../common/weapons/all.qc + +../common/turrets/cl_turrets.qc +../common/turrets/turrets.qc + - ../common/triggers/include.qc ../csqcmodellib/cl_model.qc diff --cc qcsrc/common/monsters/sv_monsters.qc index b453ba257,f9660c02f..249e6f97e --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@@ -14,10 -14,8 +14,10 @@@ #include "../../server/defs.qh" #include "../deathtypes.qh" #include "../../server/mutators/mutators_include.qh" - #include "../../server/steerlib.qh" - #include "../turrets/sv_turrets.qh" - #include "../turrets/util.qh" - #include "../vehicles/sv_vehicles.qh" - #include "../../server/tturrets/include/turrets_early.qh" ++ #include "../../server/steerlib.qh" ++ #include "../turrets/sv_turrets.qh" ++ #include "../turrets/util.qh" + #include "../vehicles/all.qh" #include "../../server/campaign.qh" #include "../../server/command/common.qh" #include "../../server/command/cmd.qh" diff --cc qcsrc/common/triggers/teleporters.qc index 5cd098100,25b18dd09..89a5fa20d --- a/qcsrc/common/triggers/teleporters.qc +++ b/qcsrc/common/triggers/teleporters.qc @@@ -15,8 -15,8 +15,8 @@@ #include "../../server/constants.qh" #include "../../server/defs.qh" #include "../deathtypes.qh" - #include "../../server/tturrets/include/turrets_early.qh" + #include "../turrets/sv_turrets.qh" - #include "../vehicles/sv_vehicles.qh" + #include "../vehicles/all.qh" #include "../mapinfo.qh" #include "../../server/anticheat.qh" #endif diff --cc qcsrc/common/vehicles/sv_vehicles.qh index 6c0a6bd17,b1921371e..b3f252e3b --- a/qcsrc/common/vehicles/sv_vehicles.qh +++ b/qcsrc/common/vehicles/sv_vehicles.qh @@@ -2,8 -2,7 +2,7 @@@ #define VEHICLES_DEF_H #ifdef SVQC -#include "../../server/tturrets/include/turrets_early.qh" +#include "../turrets/sv_turrets.qh" - #include "sv_vehicles.qh" // #define VEHICLES_USE_ODE diff --cc qcsrc/server/g_damage.qc index ba9ed8898,0721e8852..9791bbd29 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@@ -6,8 -6,9 +6,8 @@@ #include "scores.qh" #include "waypointsprites.qh" #include "spawnpoints.qh" -#include "tturrets/include/turrets_early.qh" #include "t_items.qh" - #include "../common/vehicles/sv_vehicles.qh" + #include "../common/vehicles/all.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" @@@ -844,7 -845,7 +844,7 @@@ void Damage (entity targ, entity inflic else victim = targ; - if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim)) - if(IS_PLAYER(victim) || IS_TURRET(victim) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim)) ++ if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim)) { if(DIFF_TEAM(victim, attacker) && !victim.frozen) { diff --cc qcsrc/server/g_damage.qh index a7916957d,98e9c9871..8d7db7f5d --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@@ -21,8 -21,8 +21,8 @@@ #include "../common/notifications.qh" #include "../common/deathtypes.qh" #include "mutators/mutators_include.qh" - #include "tturrets/include/turrets_early.qh" + #include "../common/turrets/sv_turrets.qh" - #include "../common/vehicles/sv_vehicles.qh" + #include "../common/vehicles/all.qh" #include "../csqcmodellib/sv_model.qh" #include "../common/playerstats.qh" #include "g_hook.qh" diff --cc qcsrc/server/mutators/gamemode_onslaught.qc index 06b65cad5,299656dcf..f5ca947f7 --- a/qcsrc/server/mutators/gamemode_onslaught.qc +++ b/qcsrc/server/mutators/gamemode_onslaught.qc @@@ -1709,9 -1701,9 +1715,10 @@@ MUTATOR_DEFINITION(gamemode_onslaught MUTATOR_HOOK(BuildMutatorsPrettyString, ons_BuildMutatorsPrettyString, CBC_ORDER_ANY); MUTATOR_HOOK(BuildMutatorsString, ons_BuildMutatorsString, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerSpawn, ons_PlayerSpawn, CBC_ORDER_ANY); + MUTATOR_HOOK(TurretSpawn, ons_TurretSpawn, CBC_ORDER_ANY); MUTATOR_HOOK(MonsterMove, ons_MonsterThink, CBC_ORDER_ANY); MUTATOR_HOOK(MonsterSpawn, ons_MonsterSpawn, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayHitsound, ons_PlayHitsound, CBC_ORDER_ANY); //MUTATOR_HOOK(Spawn_Score, ons_Spawn_Score, CBC_ORDER_ANY); MUTATOR_ONADD diff --cc qcsrc/server/mutators/mutators_include.qc index 7a241e4e7,c6f28cb52..3129af92f --- a/qcsrc/server/mutators/mutators_include.qc +++ b/qcsrc/server/mutators/mutators_include.qc @@@ -45,8 -45,8 +45,8 @@@ #include "../../common/notifications.qh" #include "../../common/deathtypes.qh" #include "mutators_include.qh" - #include "../tturrets/include/turrets_early.qh" + #include "../../common/turrets/sv_turrets.qh" - #include "../../common/vehicles/sv_vehicles.qh" + #include "../../common/vehicles/all.qh" #include "../campaign.qh" #include "../../common/campaign_common.qh" #include "../../common/mapinfo.qh" @@@ -75,7 -75,7 +75,7 @@@ #include "../round_handler.qh" #include "../item_key.qh" #include "../pathlib/pathlib.qh" - #include "../../common/vehicles/vehicles.qh" - #include "../tturrets/include/turrets.qh" ++ #include "../../common/vehicles/all.qh" #endif #include "../../common/mutators/base.qh" diff --cc qcsrc/server/progs.src index 10113b0de,e5251bef3..16769c8a6 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@@ -102,18 -101,14 +101,20 @@@ weapons/weaponsystem.q ../common/triggers/include.qc ../common/urllib.qc ../common/util.qc - ../common/vehicles/vehicles_include.qc ../common/items/all.qc + ../common/monsters/all.qc + ../common/mutators/all.qc + ../common/vehicles/all.qc + ../common/weapons/all.qc // TODO +../common/turrets/sv_turrets.qc +../common/turrets/config.qc +../common/turrets/util.qc +../common/turrets/turrets.qc +../common/turrets/checkpoint.qc +../common/turrets/targettrigger.qc ../common/weapons/config.qc - ../common/weapons/all.qc // TODO ../csqcmodellib/sv_model.qc