From 7f2fe3e3578d421d822172932b25a3156b01391c Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 17 Feb 2014 13:11:43 -0500 Subject: [PATCH] Move append_to_string to its proper place --- qcsrc/common/util.qh | 2 ++ qcsrc/common/weapons/w_arc.qc | 6 +++--- qcsrc/menu/xonotic/util.qc | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index a7e656592..ae378ddfd 100644 --- 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 66ce9926b..332b98a99 100644 --- 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 f06866ccf..76abad81f 100644 --- 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; -- 2.39.2