quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed ui folder. Moved menudef.h to game project.

Browse Source
This commit is contained in:
Artem Kharytoniuk 2016-07-09 20:46:15 +03:00
parent 6fc72c1d9e
commit 09d9539a14
8 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/cgame/cg_servercmds.c
View File

@ -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);
/*
=================

2
code/game/ai_cmd.c
View File

@ -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];

2
code/game/ai_dmnet.c
View File

@ -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

2
code/game/ai_dmq3.c
View File

@ -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

2
code/game/ai_team.c
View File

@ -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

2
code/game/ai_vcmd.c
View File

@ -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

2
code/game/g_cmds.c
View File

@ -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
/*
==================

0
ui/menudef.h → code/game/menudef.h
View File