From: Lyberta Date: Mon, 11 Jun 2018 17:39:04 +0000 (+0300) Subject: Started work on better fraglimit. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3902edff83bb9f8801048ec50ccc154529f0e18e;p=xonotic%2Fxonotic-data.pk3dir.git Started work on better fraglimit. --- diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 842f5b53c..85dea37db 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1894,7 +1894,10 @@ void CheckRules_World() if(checkrules_status == WINNING_YES) bprint("Hey! Someone ran out of spawns!\n"); else if(MUTATOR_CALLHOOK(CheckRules_World, checkrules_status, timelimit, fraglimit)) + { checkrules_status = M_ARGV(0, float); + fraglimit = M_ARGV(2, float); + } else checkrules_status = WinningCondition_Scores(fraglimit, leadlimit); diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index cf39f337b..0f7bb4415 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -911,6 +911,7 @@ enum { /**/ o(float, MUTATOR_ARGV_0_float) \ /* time limit */ i(float, MUTATOR_ARGV_1_float) \ /* frag limit */ i(float, MUTATOR_ARGV_2_float) \ + /**/ o(float, MUTATOR_ARGV_2_float) \ /**/ MUTATOR_HOOKABLE(CheckRules_World, EV_CheckRules_World);