From b3784ffe4e9339aa12f4ffb99d181d7ea85bdb45 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 21 Feb 2013 20:57:09 -0500 Subject: [PATCH] That belongs in hud.qh, not my shit --- qcsrc/client/hud.qc | 1 + qcsrc/client/hud.qh | 9 +++++++++ qcsrc/common/notifications.qh | 12 ++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 5cdc31746..8e03fde9d 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2056,6 +2056,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s } }*/ } + void HUD_Notify_Push(string icon, string attacker, string victim) { if(icon != "") diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 0da6ac5d0..8ea7c5e81 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -340,3 +340,12 @@ switch(id) { \ case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdatePosSize(engineinfo) break;\ default: HUD_Panel_UpdatePosSizeForId_Part2(id)\ } + +#define KN_MAX_ENTRIES 10 + +float kn_index; +float killnotify_times[KN_MAX_ENTRIES]; +string killnotify_icon[KN_MAX_ENTRIES]; +string killnotify_attackers[KN_MAX_ENTRIES]; +string killnotify_victims[KN_MAX_ENTRIES]; +void HUD_Notify_Push(string icon, string attacker, string victim); diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index ee3a4f207..4cc5b0758 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -52,16 +52,8 @@ void Local_Notification(float net_type, float net_name, ...count); void Local_Notification_Without_VarArgs(float net_type, float net_name, float stringcount, float floatcount, string s1, string s2, string s3, string s4, float f1, float f2, float f3, float f4); #ifdef CSQC // CLIENT ONLY -#define KN_MAX_ENTRIES 10 - -float kn_index; -float killnotify_times[KN_MAX_ENTRIES]; -string killnotify_icon[KN_MAX_ENTRIES]; -string killnotify_attackers[KN_MAX_ENTRIES]; -string killnotify_victims[KN_MAX_ENTRIES]; -void HUD_Notify_Push(string icon, string attacker, string victim); void Read_Notification(float is_new); -#endif // ifdef CSQC +#endif #ifdef SVQC // SERVER ONLY #define NOTIF_ONE 1 @@ -80,7 +72,7 @@ void Send_Notification_Legacy_Wrapper(float broadcast, entity client, float net_ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, float countdown_num); void Send_CSQC_Centerprint_Generic_Expire(entity e, float id); -#endif // ifdef SVQC +#endif // ==================================== -- 2.39.2