X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qh;h=e6b17b0e775d76f1868c05d592c633844b1b8b8b;hp=22a91dc2c6dca767072fca80c2575c1fa3c4a2e1;hb=961f49f204b45a584a06e2ef64fb2d6b9d9af203;hpb=0f060ee04a520b3692340198b22fa6184181c827 diff --git a/qcsrc/server/round_handler.qh b/qcsrc/server/round_handler.qh index 22a91dc2c..e6b17b0e7 100644 --- a/qcsrc/server/round_handler.qh +++ b/qcsrc/server/round_handler.qh @@ -1,7 +1,9 @@ +#pragma once + entity round_handler; .float delay; // stores delay from round end to countdown start .float count; // stores initial number of the countdown -.float wait; // it's set to TRUE when round ends, to FALSE when countdown starts +.float wait; // it's set to true when round ends, to false when countdown starts .float cnt; // its initial value is .count + 1, then decreased while counting down // reaches 0 when the round starts .float round_timelimit; @@ -15,9 +17,8 @@ void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, v void round_handler_Reset(float next_think); void round_handler_Remove(); -#define round_handler_IsActive() (round_handler != world) +#define round_handler_IsActive() (round_handler != NULL) #define round_handler_AwaitingNextRound() (round_handler.wait) #define round_handler_CountdownRunning() (!round_handler.wait && round_handler.cnt) #define round_handler_IsRoundStarted() (!round_handler.wait && !round_handler.cnt) #define round_handler_GetEndTime() (round_handler.round_endtime) -