Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / net_notice.qh

diff --git a/qcsrc/common/net_notice.qh b/qcsrc/common/net_notice.qh
index ac6a5eae94e8f26917a09e62178ba1531b75c198..0eecd6bdf317e9a4bc67dfd45a9d5582a69062a6 100644 (file)
--- a/qcsrc/common/net_notice.qh
+++ b/qcsrc/common/net_notice.qh
@@ -1,38 +1,4 @@
-#ifndef NET_NOTICE_H
-#define NET_NOTICE_H
-
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-    #include "nades.qh"
-    #include "buffs.qh"
-    #include "test.qh"
-    #include "counting.qh"
-    #include "urllib.qh"
-    #include "command/markup.qh"
-    #include "command/rpn.qh"
-    #include "command/generic.qh"
-    #include "command/shared_defs.qh"
-#endif
-
-#ifdef CSQC
-void cl_notice_read();
-void sv_notice_to(entity _to, string _notice, float _howlong, float _modal);
-#endif
+#pragma once
 
 #ifdef SVQC
 string autocvar_sv_join_notices;
@@ -40,6 +6,11 @@ float  autocvar_sv_join_notices_time;
 
 void sv_notice_to(entity _to, string _notice, float _howlong, float _modal);
 void sv_notice_toall(string _notice, float _howlong, float _modal);
-void sv_notice_join();
+void sv_notice_join(entity _to);
+#endif
+
+#ifdef CSQC
+void cl_notice_read();
+
+void cl_notice_run();
 #endif
-#endif
\ No newline at end of file