X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qc;h=d5b0281338ac22f1999db48338432feb482f0af2;hb=e744d300162d41aec3e2a7f146012635e040b77a;hp=af69e8e9e55d30a826f56d4bb6d78c384435ff39;hpb=ab18855f2de6204798b29f9a7f2adc6382d39d1b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index af69e8e9e..d5b028133 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -1,3 +1,9 @@ +#include "round_handler.qh" +#include "_all.qh" + +#include "command/vote.qh" +#include "../common/util.qh" + void round_handler_Think() { float f; @@ -17,10 +23,10 @@ void round_handler_Think() if(self.wait) { - self.wait = FALSE; + self.wait = false; self.cnt = self.count + 1; // init countdown round_starttime = time + self.count; - reset_map(TRUE); + reset_map(true); } if(self.cnt > 0) // countdown running @@ -52,7 +58,7 @@ void round_handler_Think() if(self.canRoundEnd()) { // schedule a new round - self.wait = TRUE; + self.wait = true; self.nextthink = time + self.delay; } else @@ -93,14 +99,14 @@ void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, v round_handler.canRoundStart = canRoundStart_func; round_handler.canRoundEnd = canRoundEnd_func; round_handler.roundStart = roundStart_func; - round_handler.wait = FALSE; + round_handler.wait = false; round_handler_Init(5, 5, 180); round_handler.nextthink = time; } void round_handler_Reset(float next_think) { - round_handler.wait = FALSE; + round_handler.wait = false; if(round_handler.count) if(round_handler.cnt < round_handler.count + 1) round_handler.cnt = round_handler.count + 1;