Changed the files to use the right ui.

This commit is contained in:
Richard Allen 2002-07-02 20:22:35 +00:00
parent 73084ebb59
commit 6fc7e680f0
9 changed files with 33 additions and 54 deletions

View file

@ -76,51 +76,6 @@ CGOBJ = \
$(CGDIRNAME)/cg_view.o \
$(CGDIRNAME)/cg_weapons.o
OLDUIOBJ = \
$(UIDIRNAME)/ui_main.o \
$(UIDIRNAME)/ui_cdkey.o \
$(UIDIRNAME)/ui_ingame.o \
$(UIDIRNAME)/ui_confirm.o \
$(UIDIRNAME)/ui_setup.o \
$(GDIRNAME)/bg_misc.o \
$(GDIRNAME)/q_math.o \
$(GDIRNAME)/q_shared.o \
$(UIDIRNAME)/ui_gameinfo.o \
$(UIDIRNAME)/ui_atoms.o \
$(UIDIRNAME)/ui_connect.o \
$(UIDIRNAME)/ui_controls2.o \
$(UIDIRNAME)/ui_demo2.o \
$(UIDIRNAME)/ui_mfield.o \
$(UIDIRNAME)/ui_credits.o \
$(UIDIRNAME)/ui_menu.o \
$(UIDIRNAME)/ui_options.o \
$(UIDIRNAME)/ui_display.o \
$(UIDIRNAME)/ui_sound.o \
$(UIDIRNAME)/ui_network.o \
$(UIDIRNAME)/ui_playermodel.o \
$(UIDIRNAME)/ui_players.o \
$(UIDIRNAME)/ui_playersettings.o \
$(UIDIRNAME)/ui_preferences.o \
$(UIDIRNAME)/ui_qmenu.o \
$(UIDIRNAME)/ui_serverinfo.o \
$(UIDIRNAME)/ui_servers2.o \
$(UIDIRNAME)/ui_sparena.o \
$(UIDIRNAME)/ui_specifyserver.o \
$(UIDIRNAME)/ui_splevel.o \
$(UIDIRNAME)/ui_sppostgame.o \
$(UIDIRNAME)/ui_startserver.o \
$(UIDIRNAME)/ui_team.o \
$(UIDIRNAME)/ui_video.o \
$(UIDIRNAME)/ui_cinematics.o \
$(UIDIRNAME)/ui_spskill.o \
$(UIDIRNAME)/ui_addbots.o \
$(UIDIRNAME)/ui_removebots.o \
$(UIDIRNAME)/ui_loadconfig.o \
$(UIDIRNAME)/ui_saveconfig.o \
$(UIDIRNAME)/ui_teamorders.o \
$(UIDIRNAME)/ui_mods.o
UIOBJ = \
$(UIDIRNAME)/ui_main.o \
$(GDIRNAME)/bg_misc.o \
@ -149,7 +104,7 @@ BQ=qvm
GDIRNAME=game
CGDIRNAME=cgame
UIDIRNAME=ui
UIDIRNAME=ta_ui
GDIR=$(MOUNT_DIR)/$(GDIRNAME)
CGDIR=$(MOUNT_DIR)/$(CGDIRNAME)
UIDIR=$(MOUNT_DIR)/$(UIDIRNAME)

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.8 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.7 2002/06/16 20:06:13 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
//
@ -25,7 +28,7 @@
#endif
#include "cg_local.h"
#include "../ui/ui_shared.h"
#include "../ta_ui/ui_shared.h"
extern displayContextDef_t cgDC;

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.55 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.54 2002/07/01 02:55:13 blaze
// change the format of the autorecorded demo name
//
@ -146,7 +149,7 @@
// be a valid snapshot this frame
#include "cg_local.h"
#include "../ui/menudef.h" // bk001205 - for Q3_ui as well
#include "../ta_ui/menudef.h" // bk001205 - for Q3_ui as well
//Blaze: holds the id to name mapping of the breakables
extern char rq3_breakables[RQ3_MAX_BREAKABLES][80];

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.10 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.9 2002/06/16 20:06:13 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
//
@ -72,7 +75,7 @@
// for the voice chats
//Blaze: Was there a extra ../?
#include "../ui/menudef.h"
#include "../ta_ui/menudef.h"
int notleader[MAX_CLIENTS];

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.31 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.30 2002/06/16 20:06:13 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
//
@ -129,7 +132,7 @@
// for the voice chats
//Blaze: was there a extra ../ here?
#include "../ui/menudef.h"
#include "../ta_ui/menudef.h"
//Makro - to get rid of the warnings
void Cmd_Bandage(gentity_t * ent);

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.49 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.48 2002/07/01 19:55:50 makro
// Reorganized things a little
//
@ -188,7 +191,7 @@
// for the voice chats
//Blaze: was there a extra ../ here?
#include "../ui/menudef.h"
#include "../ta_ui/menudef.h"
//Makro - to get rid of the warnings
void Cmd_Bandage(gentity_t * ent);

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.11 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.10 2002/06/22 00:19:57 jbravo
// Cleanups for colors and stopped bots looking for team leaders in TP
//
@ -69,7 +72,7 @@
// for the voice chats
//Blaze: was there a extra ../ here?
#include "../ui/menudef.h"
#include "../ta_ui/menudef.h"
//ctf task preferences for a client
typedef struct bot_ctftaskpreference_s {

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.8 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.7 2002/06/16 20:06:13 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
//
@ -66,7 +69,7 @@
// for the voice chats
//Blaze: was there a extra ../ here?
#include "../ui/menudef.h"
#include "../ta_ui/menudef.h"
typedef struct voiceCommand_s {
char *cmd;

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.149 2002/07/02 20:22:35 jbravo
// Changed the files to use the right ui.
//
// Revision 1.148 2002/07/02 19:15:17 jbravo
// Drop weapon with akimbos now behaves like AQ, plus no suicides during LCA
//
@ -354,7 +357,7 @@
#include "zcam.h"
//Blaze: was there a extra ../ here?
#include "../ui/menudef.h" // for the voice chats
#include "../ta_ui/menudef.h" // for the voice chats
//Blaze for door code
void Use_BinaryMover(gentity_t * ent, gentity_t * other, gentity_t * activator);