Move append_to_string to its proper place

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index a7e656592633eed1b96263c5d7b38ff66f0269fc..ae378ddfd55cfc1420385f4fd88ef7f5319c3a41 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -445,3 +445,5 @@ float Announcer_PickNumber(float type, float num);
 float Mod_Q1BSP_SuperContentsFromNativeContents(float nativecontents);
 float Mod_Q1BSP_NativeContentsFromSuperContents(float supercontents);
 #endif
+
+#define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 66ce9926ba98cec09ad81c66739cc06a3ac64f14..332b98a991b9617dd9a334db43caf638e9984483 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -41,6 +41,9 @@ REGISTER_WEAPON(
 
 #ifndef MENUQC
 vector arc_shotorigin[4];
+#define ARC_BT_WALL 1
+#define ARC_BT_HEAL 2
+#define ARC_BT_ENEMY 3
 #endif
 #ifdef SVQC
 #define ARC_MAX_SEGMENTS 20
@@ -57,9 +60,6 @@ void ArcInit(void);
 .vector beam_wantdir;
 .float beam_initialized;
 .float beam_type;
-#define ARC_BT_WALL 1
-#define ARC_BT_HEAL 2
-#define ARC_BT_ENEMY 3
 #endif
 #else
 #ifdef SVQC

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index f06866ccffdd64ebd7a2b84ea4efc993824010fc..76abad81fbe715fcf514c2082e80ae1bfb95380a 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -343,7 +343,6 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
                
                switch(substring(argv(i), 0, 1))
                {
-                       #define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))
                        case "V":
                        {
                                un_version = s;