Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / centerprint.qc

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 2fcf130fadadb920a7ca9f0b656efc47355b8c59..a0a5389e7e159e9e3f4ac52df534303ef47da9b0 100644 (file)
--- a/qcsrc/client/hud/panel/centerprint.qc
+++ b/qcsrc/client/hud/panel/centerprint.qc
@@ -1,8 +1,8 @@
 #include "centerprint.qh"
 
-#include "scoreboard.qh"
+#include <client/draw.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <common/notifications/all.qh>
-#include <client/miscfunctions.qh>
 
 // CenterPrint (#16)
 
@@ -281,7 +281,7 @@ void HUD_CenterPrint()
                else // Expiring soon, so fade it out.
                        a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out);
 
-               if(centerprint_msgID[j] == CPID_TIMEIN)
+               if(centerprint_msgID[j] == ORDINAL(CPID_TIMEIN))
                        a = 1;
 
                // while counting down show it anyway in order to hold the current message position