From: terencehill Date: Tue, 18 Dec 2018 14:31:46 +0000 (+0100) Subject: Very minor cleanups X-Git-Tag: xonotic-v0.8.5~1684 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=9ff975c1d5a91d3e27ea7f77c30375b50f2c15a6;p=xonotic%2Fxonotic-data.pk3dir.git Very minor cleanups --- diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 5de11a3b8..61ba69b6a 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -322,6 +322,7 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum } vector prev_mousepos; +// draws map vote or gametype vote void MapVote_Draw() { string map; @@ -464,7 +465,7 @@ void MapVote_Draw() mv_selection = MapVote_Selection(pos, dist, rows, mv_columns); if (mv_top2_time) - mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time)*(time - mv_top2_time)); + mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time) ** 2); void (vector, float, float, string, string, float, float) DrawItem; diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index 641ca893e..9ebcffae3 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -580,7 +580,7 @@ void bot_calculate_stepheightvec() jumpstepheightvec = stepheightvec + jumpheight_vec * 0.85; // reduce it a bit to make the jumps easy } -float bot_fixcount() +bool bot_fixcount() { int activerealplayers = 0; int realplayers = 0; diff --git a/qcsrc/server/bot/default/bot.qh b/qcsrc/server/bot/default/bot.qh index c4da14a4b..98b2ae3df 100644 --- a/qcsrc/server/bot/default/bot.qh +++ b/qcsrc/server/bot/default/bot.qh @@ -88,7 +88,7 @@ int _content_type; */ entity bot_spawn(); -float bot_fixcount(); +bool bot_fixcount(); void bot_think(entity this); void bot_setnameandstuff(entity this);