diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
| commit | d37536edf4660f3c46e4876b6d72e9a200549ffe (patch) | |
| tree | 637eb5f3e49f4075ecdef97a31f5e8157cee73a2 /code/cgame/cg_servercmds.c | |
| parent | 4496eacc4ec7406fd694693da5a7f9589933f7fd (diff) | |
| download | ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.tar.gz ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.zip | |
* Merge unified-sdl to trunk
* Bump Q3_VERSION to 1.35
git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/cgame/cg_servercmds.c')
| -rw-r--r-- | code/cgame/cg_servercmds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c index 94cf332..185a068 100644 --- a/code/cgame/cg_servercmds.c +++ b/code/cgame/cg_servercmds.c @@ -25,7 +25,7 @@ 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 +#include "../../ui/menudef.h" typedef struct { const char *order; @@ -46,7 +46,7 @@ static const orderTask_t validOrders[] = { static const int numValidOrders = sizeof(validOrders) / sizeof(orderTask_t); -#ifdef MISSIONPACK // bk001204 +#ifdef MISSIONPACK static int CG_ValidOrder(const char *p) { int i; for (i = 0; i < numValidOrders; i++) { |