From 09d9539a147eb9e44cc41f0b8891194aa6785619 Mon Sep 17 00:00:00 2001 From: Artem Kharytoniuk Date: Sat, 9 Jul 2016 20:46:15 +0300 Subject: [PATCH] Removed ui folder. Moved menudef.h to game project. --- code/cgame/cg_servercmds.c | 20 -------------------- code/game/ai_cmd.c | 2 +- code/game/ai_dmnet.c | 2 +- code/game/ai_dmq3.c | 2 +- code/game/ai_team.c | 2 +- code/game/ai_vcmd.c | 2 +- code/game/g_cmds.c | 2 +- {ui => code/game}/menudef.h | 0 8 files changed, 6 insertions(+), 26 deletions(-) rename {ui => code/game}/menudef.h (100%) diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c index 7a180f3..35623cf 100644 --- a/code/cgame/cg_servercmds.c +++ b/code/cgame/cg_servercmds.c @@ -25,26 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // be a valid snapshot this frame #include "cg_local.h" -#include "../../ui/menudef.h" // bk001205 - for Q3_ui as well - -typedef struct { - const char *order; - int taskNum; -} orderTask_t; - -static const orderTask_t validOrders[] = { - { VOICECHAT_GETFLAG, TEAMTASK_OFFENSE }, - { VOICECHAT_OFFENSE, TEAMTASK_OFFENSE }, - { VOICECHAT_DEFEND, TEAMTASK_DEFENSE }, - { VOICECHAT_DEFENDFLAG, TEAMTASK_DEFENSE }, - { VOICECHAT_PATROL, TEAMTASK_PATROL }, - { VOICECHAT_CAMP, TEAMTASK_CAMP }, - { VOICECHAT_FOLLOWME, TEAMTASK_FOLLOW }, - { VOICECHAT_RETURNFLAG, TEAMTASK_RETRIEVE }, - { VOICECHAT_FOLLOWFLAGCARRIER, TEAMTASK_ESCORT } -}; - -static const int numValidOrders = sizeof(validOrders) / sizeof(orderTask_t); /* ================= diff --git a/code/game/ai_cmd.c b/code/game/ai_cmd.c index 244345a..bc5a466 100644 --- a/code/game/ai_cmd.c +++ b/code/game/ai_cmd.c @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "match.h" //string matching types and vars // for the voice chats -#include "../../ui/menudef.h" +#include "menudef.h" int notleader[MAX_CLIENTS]; diff --git a/code/game/ai_dmnet.c b/code/game/ai_dmnet.c index 956f1fc..8d6bd34 100644 --- a/code/game/ai_dmnet.c +++ b/code/game/ai_dmnet.c @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "match.h" //string matching types and vars // for the voice chats -#include "../../ui/menudef.h" +#include "menudef.h" //goal flag, see be_ai_goal.h for the other GFL_* #define GFL_AIR 128 diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c index 569b549..1595e9d 100644 --- a/code/game/ai_dmq3.c +++ b/code/game/ai_dmq3.c @@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "match.h" //string matching types and vars // for the voice chats -#include "../../ui/menudef.h" // sos001205 - for q3_ui also +#include "menudef.h" // sos001205 - for q3_ui also // from aasfile.h #define AREACONTENTS_MOVER 1024 diff --git a/code/game/ai_team.c b/code/game/ai_team.c index a36e9e5..56ebe84 100644 --- a/code/game/ai_team.c +++ b/code/game/ai_team.c @@ -52,7 +52,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "match.h" // for the voice chats -#include "../../ui/menudef.h" +#include "menudef.h" //ctf task preferences for a client typedef struct bot_ctftaskpreference_s diff --git a/code/game/ai_vcmd.c b/code/game/ai_vcmd.c index e050267..dbac013 100644 --- a/code/game/ai_vcmd.c +++ b/code/game/ai_vcmd.c @@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "match.h" //string matching types and vars // for the voice chats -#include "../../ui/menudef.h" +#include "menudef.h" typedef struct voiceCommand_s diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c index 3fee6c9..3df2bec 100644 --- a/code/game/g_cmds.c +++ b/code/game/g_cmds.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // #include "g_local.h" -#include "../../ui/menudef.h" // for the voice chats +#include "menudef.h" // for the voice chats /* ================== diff --git a/ui/menudef.h b/code/game/menudef.h similarity index 100% rename from ui/menudef.h rename to code/game/menudef.h