From 678b11c9f70884a1a9c96700d4545fc7b8ad2884 Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Sat, 30 Jul 2016 16:56:45 +0200
Subject: [PATCH] Move scoreboard files to hud/panel/

---
 qcsrc/client/_mod.inc                      | 1 -
 qcsrc/client/_mod.qh                       | 1 -
 qcsrc/client/hud/all.inc                   | 1 +
 qcsrc/client/hud/hud.qc                    | 1 -
 qcsrc/client/hud/panel/_mod.inc            | 1 +
 qcsrc/client/hud/panel/_mod.qh             | 1 +
 qcsrc/client/hud/panel/centerprint.qc      | 2 +-
 qcsrc/client/hud/panel/score.qc            | 2 +-
 qcsrc/client/{ => hud/panel}/scoreboard.qc | 4 +---
 qcsrc/client/{ => hud/panel}/scoreboard.qh | 1 +
 qcsrc/client/main.qc                       | 2 +-
 qcsrc/client/mapvoting.qc                  | 2 +-
 qcsrc/client/view.qc                       | 2 +-
 13 files changed, 10 insertions(+), 11 deletions(-)
 rename qcsrc/client/{ => hud/panel}/scoreboard.qc (99%)
 rename qcsrc/client/{ => hud/panel}/scoreboard.qh (92%)

diff --git a/qcsrc/client/_mod.inc b/qcsrc/client/_mod.inc
index 186be9740..0920265d6 100644
--- a/qcsrc/client/_mod.inc
+++ b/qcsrc/client/_mod.inc
@@ -6,7 +6,6 @@
 #include <client/mapvoting.qc>
 #include <client/miscfunctions.qc>
 #include <client/player_skeleton.qc>
-#include <client/scoreboard.qc>
 #include <client/shownames.qc>
 #include <client/teamradar.qc>
 #include <client/view.qc>
diff --git a/qcsrc/client/_mod.qh b/qcsrc/client/_mod.qh
index 1c66ff781..75266dfa2 100644
--- a/qcsrc/client/_mod.qh
+++ b/qcsrc/client/_mod.qh
@@ -6,7 +6,6 @@
 #include <client/mapvoting.qh>
 #include <client/miscfunctions.qh>
 #include <client/player_skeleton.qh>
-#include <client/scoreboard.qh>
 #include <client/shownames.qh>
 #include <client/teamradar.qh>
 #include <client/view.qh>
diff --git a/qcsrc/client/hud/all.inc b/qcsrc/client/hud/all.inc
index aa36eec40..8305304fe 100644
--- a/qcsrc/client/hud/all.inc
+++ b/qcsrc/client/hud/all.inc
@@ -19,3 +19,4 @@
 // #include "panel/mapvote.qc"
 // #include "panel/itemstime.qc"
 #include "panel/quickmenu.qc"
+#include "panel/scoreboard.qc"
diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 62f5dcb6d..2c1a7e1b0 100644
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -2,7 +2,6 @@
 
 #include "hud_config.qh"
 #include "../mapvoting.qh"
-#include "../scoreboard.qh"
 #include "../teamradar.qh"
 #include <common/t_items.qh>
 #include <common/deathtypes/all.qh>
diff --git a/qcsrc/client/hud/panel/_mod.inc b/qcsrc/client/hud/panel/_mod.inc
index 5681474b8..d495fdee7 100644
--- a/qcsrc/client/hud/panel/_mod.inc
+++ b/qcsrc/client/hud/panel/_mod.inc
@@ -18,3 +18,4 @@
 #include <client/hud/panel/timer.qc>
 #include <client/hud/panel/vote.qc>
 #include <client/hud/panel/weapons.qc>
+#include <client/hud/panel/scoreboard.qc>
diff --git a/qcsrc/client/hud/panel/_mod.qh b/qcsrc/client/hud/panel/_mod.qh
index 930a3fe02..fa9b75530 100644
--- a/qcsrc/client/hud/panel/_mod.qh
+++ b/qcsrc/client/hud/panel/_mod.qh
@@ -18,3 +18,4 @@
 #include <client/hud/panel/timer.qh>
 #include <client/hud/panel/vote.qh>
 #include <client/hud/panel/weapons.qh>
+#include <client/hud/panel/scoreboard.qh>
diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 7dfaa909e..cbba0faf3 100644
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -1,6 +1,6 @@
 #include "centerprint.qh"
 
-#include <client/scoreboard.qh>
+#include "scoreboard.qh"
 
 // CenterPrint (#16)
 
diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index b07b84ed3..c7128b1eb 100644
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -1,6 +1,6 @@
 #include "score.qh"
 
-#include <client/scoreboard.qh>
+#include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
similarity index 99%
rename from qcsrc/client/scoreboard.qc
rename to qcsrc/client/hud/panel/scoreboard.qc
index cc605d630..72a058d5f 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1,8 +1,6 @@
 #include "scoreboard.qh"
 
-#include "hud/panel/quickmenu.qh"
-#include "hud/all.qh"
-
+#include "quickmenu.qh"
 #include <common/ent_cs.qh>
 #include <common/constants.qh>
 #include <common/mapinfo.qh>
diff --git a/qcsrc/client/scoreboard.qh b/qcsrc/client/hud/panel/scoreboard.qh
similarity index 92%
rename from qcsrc/client/scoreboard.qh
rename to qcsrc/client/hud/panel/scoreboard.qh
index 8fccae948..227e5a91d 100644
--- a/qcsrc/client/scoreboard.qh
+++ b/qcsrc/client/hud/panel/scoreboard.qh
@@ -1,4 +1,5 @@
 #pragma once
+#include "../panel.qh"
 
 float xmin, xmax, ymin, ymax, sbwidth;
 
diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index bd9e82ed2..9274613cb 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -4,8 +4,8 @@
 #include "hud/all.qh"
 #include "mapvoting.qh"
 #include "mutators/events.qh"
+#include "hud/panel/scoreboard.qh"
 #include "hud/panel/quickmenu.qh"
-#include "scoreboard.qh"
 #include "shownames.qh"
 #include <common/t_items.qh>
 #include "wall.qh"
diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index bfc25e99c..b7751ed06 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,7 +1,7 @@
 #include "mapvoting.qh"
 
 #include "hud/all.qh"
-#include "scoreboard.qh"
+#include "hud/panel/scoreboard.qh"
 
 #include <common/mapinfo.qh>
 
diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 47cf9337d..fbfb5d57a 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -3,8 +3,8 @@
 #include "announcer.qh"
 #include "hud/all.qh"
 #include "mapvoting.qh"
-#include "scoreboard.qh"
 #include "shownames.qh"
+#include "hud/panel/scoreboard.qh"
 #include "hud/panel/quickmenu.qh"
 
 #include "mutators/events.qh"
-- 
2.39.2