]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Make it pass compilation unit tests
authorterencehill <piuntn@gmail.com>
Tue, 16 Aug 2016 14:04:39 +0000 (16:04 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 16 Aug 2016 14:04:39 +0000 (16:04 +0200)
18 files changed:
qcsrc/client/hud/panel/ammo.qc
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/engineinfo.qc
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/minigame.qc
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/hud/panel/notify.qc
qcsrc/client/hud/panel/physics.qc
qcsrc/client/hud/panel/powerups.qc
qcsrc/client/hud/panel/pressedkeys.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/racetimer.qc
qcsrc/client/hud/panel/radar.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/client/hud/panel/vote.qc
qcsrc/client/hud/panel/weapons.qc

index 27ba900f05a41292e3ed5b1153378e8ded089422..5561c022ca6d906ba45a52b374f47c1faa5483bc 100644 (file)
@@ -1,5 +1,6 @@
 #include "ammo.qh"
 
+#include "scoreboard.qh"
 #include <common/t_items.qh>
 
 // Ammo (#1)
index 270eeb87f5bae5648fd50de28bd21cfc89e4e50b..f27e9625b463084459b8b41c06f9936ca8204601 100644 (file)
@@ -1,5 +1,7 @@
 #include "chat.qh"
-/** Handle chat as a panel (#12) */
+
+// Chat (#12)
+
 void HUD_Chat()
 {
        if(!autocvar__hud_configure)
index be5863a4c4a5fbeb72803a6db28f8e9c83962557..b0cc374199f5e1830e8afcc15835044092f320ae 100644 (file)
@@ -1,5 +1,6 @@
 #include "engineinfo.qh"
-// Engine info panel (#13)
+
+// Engine info (#13)
 
 float prevfps;
 float prevfps_time;
index 54685aa14e2d87004c3c2912aa515f296b852116..6407628e85b5cf25bae92169f6a8bb4e053f9e8f 100644 (file)
@@ -1,8 +1,10 @@
 #include "healtharmor.qh"
 
+#include "scoreboard.qh"
 #include <common/deathtypes/all.qh>
 
-/** Health/armor (#3) */
+// Health/armor (#3)
+
 void HUD_HealthArmor()
 {
        int armor, health, fuel;
index ebca95d17a8b6974feb84c3421d82fcff491215f..4037d5bef49735409d0bdfe3a041f031b8ff37ce 100644 (file)
@@ -1,9 +1,10 @@
 #include "infomessages.qh"
 
+#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 
-// Info messages panel (#14)
+// Info messages (#14)
 
 float autocvar_hud_panel_infomessages_group0 = 1;
 float autocvar_hud_panel_infomessages_group_fadetime = 0.4;
index 933528a495f72f20d47b1f76dae0e9c50d05af4c..618f30b1080fa67ae0f4285ee7cc214313bcb0c5 100644 (file)
@@ -1,4 +1,5 @@
 #include "minigame.qh"
-// Minigame
+
+// Minigame (#17, #18, #19, #20)
 
 #include <common/minigames/cl_minigames_hud.qc>
index 95009d2ed07d771ba82d3f45fd9df28240b6c1e7..fe0bd497b3d298104aee46d4c76f9941eb7ec682 100644 (file)
@@ -4,7 +4,7 @@
 #include <common/ent_cs.qh>
 #include <server/mutators/mutator/gamemode_ctf.qh> // TODO: remove
 
-// Mod icons panel (#10)
+// Mod icons (#10)
 
 bool mod_active; // is there any active mod icon?
 
index 479800f9061e6018f5febf8e6cc1572a4933f134..d132ed44b0c35ee25406248d28f110d91196482f 100644 (file)
@@ -1,5 +1,8 @@
 #include "notify.qh"
-// Notification area (#4)
+
+#include "scoreboard.qh"
+
+// Notifications (#4)
 
 void HUD_Notify_Push(string icon, string attacker, string victim)
 {
index c28fd78a43e5e82b0e1ebbba0841d7696be33053..6176cdf4642787c6253cd02abded9423a8b98271 100644 (file)
@@ -1,10 +1,11 @@
 #include "physics.qh"
 
+#include "scoreboard.qh"
 #include <client/main.qh>
 #include <common/mapinfo.qh>
 #include <lib/csqcmodel/cl_player.qh>
 
-// Physics panel (#15)
+// Physics (#15)
 
 vector acc_prevspeed;
 float acc_prevtime, acc_avg, top_speed, top_speed_time;
index dd4c0597ebb643ea10e20e42310caa9df9d8e035..e2b47e216cd5a4387405e47eaaa6216904faf504 100644 (file)
@@ -1,5 +1,6 @@
 #include "powerups.qh"
 
+#include "scoreboard.qh"
 #include <common/items/all.qc>
 
 // Powerups (#2)
index e1fb8b4746cae42fb4782226e5d2d1ae187b32d4..e44eca5f7483c36ea022561dee76b35b2b460a78 100644 (file)
@@ -1,5 +1,9 @@
 #include "pressedkeys.qh"
-/** Draw pressed keys (#11) */
+
+#include "scoreboard.qh"
+
+// Pressed keys (#11)
+
 void HUD_PressedKeys()
 {
        if(!autocvar__hud_configure)
index ef08fdc6030e4c8da883b21c82b895f71129013f..67fc9e6c8eaca23d505d6382ebd46cbb437a5c4b 100644 (file)
@@ -1,10 +1,12 @@
 #include "quickmenu.qh"
-// QuickMenu (#23)
 
+#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <client/hud/all.qh>
 #include <client/mapvoting.qh>
 
+// QuickMenu (#23)
+
 // QUICKMENU_MAXLINES must be <= 10
 const int QUICKMENU_MAXLINES = 10;
 // visible entries are loaded from QuickMenu_Buffer into QuickMenu_Page_* arrays
index f22f19846f50f7ea090ff430688292312687880a..deec4a80f1a755b7dd24a63d272c85298d6c8264 100644 (file)
@@ -1,8 +1,9 @@
 #include "racetimer.qh"
 
+#include "scoreboard.qh"
 #include <common/mapinfo.qh>
 
-/** Race timer (#8) */
+// Race timer (#6)
 
 // return the string of the onscreen race timer
 string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname)
index 9704f81c6af0dfaec059f674b1d7b22d3520175e..c357c6b999bc895ca0b56ee11bc654b20169fc80 100644 (file)
@@ -1,5 +1,6 @@
 #include "radar.qh"
 
+#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 #include <client/mapvoting.qh>
index 4e4897f24ec95129387d130dea513822dc3de68f..34b4f57d2207c4cb941e38cc24903a892ce30236 100644 (file)
@@ -8,6 +8,8 @@
 #include <common/stats.qh>
 #include <common/teams.qh>
 
+// Scoreboard (#24)
+
 float sbt_bg_alpha;
 float sbt_fg_alpha;
 float sbt_fg_alpha_self;
index a87ca93a22695b46d52ed5a9ebef74df401d55a4..85341b4313f8012b3a546e9d96fe229d64c2d0d2 100644 (file)
@@ -1,4 +1,7 @@
 #include "timer.qh"
+
+// Timer (#5)
+
 void HUD_Timer()
 {
        if(!autocvar__hud_configure)
index 6017e8efa3d973de38e86e2513fdb8b10e4ca224..b6622f8aa871412f24e20f9fd7231e64c8f474ac 100644 (file)
@@ -2,7 +2,8 @@
 
 #include <common/mapinfo.qh>
 
-/** Vote window (#9) */
+// Vote (#9)
+
 void HUD_Vote()
 {
        if(autocvar_cl_allow_uid2name == -1 && (gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (serverflags & SERVERFLAG_PLAYERSTATS)))
index c4481ad0c333158bcf474b01cd2e1421da7d61a5..1006e7a903888326a7e27c0f57207475b092bc97 100644 (file)
@@ -1,5 +1,8 @@
 #include "weapons.qh"
-// Weapon icons (#0)
+
+#include "scoreboard.qh"
+
+// Weapons (#0)
 
 entity weaponorder[Weapons_MAX];
 void weaponorder_swap(int i, int j, entity pass)