X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fworld.qh;h=d82469c11ef1ca7573752897113a614c673e01f3;hb=4677838f1b8eede1622d78afe6e156991ebda476;hp=242b3369470546ff8c0a1c4b0169e14605237044;hpb=b661d07fc75cd9448da4fe89af98b426b4e94c7f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh index 242b33694..d82469c11 100644 --- a/qcsrc/server/world.qh +++ b/qcsrc/server/world.qh @@ -114,7 +114,7 @@ float g_weapon_stay; float want_weapon(entity weaponinfo, float allguns); // WEAPONTODO: what still needs done? float g_grappling_hook; -float warmup_stage; +int warmup_stage; bool sv_ready_restart_after_countdown; @@ -143,7 +143,7 @@ void ReadyRestart(bool forceWarmupEnd); void DumpStats(float final); -bool MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundmax, float goodcontents, float badcontents, float badsurfaceflags, int attempts, float maxaboveground, float minviewdistance); +bool MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundmax, float goodcontents, float badcontents, float badsurfaceflags, int attempts, float maxaboveground, float minviewdistance, bool frompos); float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, float badsurfaceflags, float attempts, float maxaboveground, float minviewdistance);