rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 07:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

MM stuff

Browse source
This commit is contained in:
Andrei Drexler 2002-06-28 20:08:42 +00:00
parent 05e414cd87
commit 01de6f5b48
3 changed files with 51 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/ta_ui/ta_ui.plg
View file

@ -3,7 +3,7 @@
<pre> <pre>
<h1>Build Log</h1> <h1>Build Log</h1>
<h3> <h3>
--------------------Configuration: ui - Win32 Release TA-------------------- --------------------Configuration: ui - Win32 Debug TA--------------------
</h3> </h3>
<h3>Command Lines</h3> <h3>Command Lines</h3>

13
reaction/ta_ui/ui_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.16 2002/06/28 20:08:42 makro
// MM stuff
//
// Revision 1.15 2002/06/16 20:06:14 jbravo // Revision 1.15 2002/06/16 20:06:14 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap" // Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
// //
@ -168,6 +171,16 @@ extern vmCvar_t ui_RQ3_modelCommand;
//extern vmCvar_t ui_RQ3_numSpectators; //extern vmCvar_t ui_RQ3_numSpectators;
//Makro - weapon menu after joining a team //Makro - weapon menu after joining a team
extern vmCvar_t ui_RQ3_weapAfterJoin; extern vmCvar_t ui_RQ3_weapAfterJoin;
//Makro - matchmode settings
extern vmCvar_t ui_RQ3_timelimit;
extern vmCvar_t ui_RQ3_roundlimit;
extern vmCvar_t ui_RQ3_roundtimelimit;
extern vmCvar_t ui_RQ3_fraglimit;
extern vmCvar_t ui_RQ3_maxplayers;
extern vmCvar_t ui_RQ3_forceteamtalk;
extern vmCvar_t ui_RQ3_limchasecam;
extern vmCvar_t ui_RQ3_tgren;
extern vmCvar_t ui_RQ3_friendlyFire;
//Makro - specify server option //Makro - specify server option
extern vmCvar_t ui_RQ3_joinAddress; extern vmCvar_t ui_RQ3_joinAddress;

41
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.37 2002/06/28 20:08:42 makro
// MM stuff
//
// Revision 1.36 2002/06/24 12:29:43 makro // Revision 1.36 2002/06/24 12:29:43 makro
// Enabled weapon/item menus in CTF // Enabled weapon/item menus in CTF
// //
@ -3894,7 +3897,18 @@ static void UI_RunMenuScript(char **args)
(int) trap_Cvar_VariableValue("g_RQ3_limchasecam"), (int) trap_Cvar_VariableValue("g_RQ3_limchasecam"),
(int) trap_Cvar_VariableValue("g_RQ3_tgren"), (int) trap_Cvar_VariableValue("g_RQ3_tgren"),
(int) trap_Cvar_VariableValue("g_friendlyFire"))); (int) trap_Cvar_VariableValue("g_friendlyFire")));
//Makro - change the SSG crosshair //Makro - sync ui MM cvars with the real ones
} else if (Q_stricmp(name, "readMMsettings") == 0) {
ui_RQ3_timelimit.integer = (int) trap_Cvar_VariableValue("timelimit");
ui_RQ3_roundlimit.integer = (int) trap_Cvar_VariableValue("g_RQ3_roundlimit");
ui_RQ3_roundtimelimit.integer = (int) trap_Cvar_VariableValue("g_RQ3_roundtimelimit");
ui_RQ3_fraglimit.integer = (int) trap_Cvar_VariableValue("fraglimit");
ui_RQ3_maxplayers.integer = (int) trap_Cvar_VariableValue("g_RQ3_maxplayers");
ui_RQ3_forceteamtalk.integer = (int) trap_Cvar_VariableValue("g_RQ3_forceteamtalk");
ui_RQ3_limchasecam.integer = (int) trap_Cvar_VariableValue("g_RQ3_limchasecam");
ui_RQ3_tgren.integer = (int) trap_Cvar_VariableValue("g_RQ3_tgren");
ui_RQ3_friendlyFire.integer = (int) trap_Cvar_VariableValue("g_friendlyFire");
//Makro - change the SSG crosshair
} else if (Q_stricmp(name, "nextSSGCrosshair") == 0) { } else if (Q_stricmp(name, "nextSSGCrosshair") == 0) {
int current, offset; int current, offset;
@ -6637,7 +6651,6 @@ vmCvar_t ui_RQ3_ssgCrosshair;
//Makro - activate the weapon menu after a team join //Makro - activate the weapon menu after a team join
vmCvar_t ui_RQ3_weapAfterJoin; vmCvar_t ui_RQ3_weapAfterJoin;
//Makro - team counts //Makro - team counts
//Handled in cgame now //Handled in cgame now
//vmCvar_t ui_RQ3_teamCount1; //vmCvar_t ui_RQ3_teamCount1;
@ -6646,9 +6659,19 @@ vmCvar_t ui_RQ3_weapAfterJoin;
//Makro - specify server option //Makro - specify server option
vmCvar_t ui_RQ3_joinAddress; vmCvar_t ui_RQ3_joinAddress;
vmCvar_t ui_RQ3_joinPort; vmCvar_t ui_RQ3_joinPort;
//Makro - demo name //Makro - demo name
vmCvar_t ui_RQ3_demoName; vmCvar_t ui_RQ3_demoName;
//Makro - matchmode settings
vmCvar_t ui_RQ3_timelimit;
vmCvar_t ui_RQ3_roundlimit;
vmCvar_t ui_RQ3_roundtimelimit;
vmCvar_t ui_RQ3_fraglimit;
vmCvar_t ui_RQ3_maxplayers;
vmCvar_t ui_RQ3_forceteamtalk;
vmCvar_t ui_RQ3_limchasecam;
vmCvar_t ui_RQ3_tgren;
vmCvar_t ui_RQ3_friendlyFire;
// bk001129 - made static to avoid aliasing // bk001129 - made static to avoid aliasing
static cvarTable_t cvarTable[] = { static cvarTable_t cvarTable[] = {
@ -6785,7 +6808,17 @@ static cvarTable_t cvarTable[] = {
{&ui_RQ3_joinAddress, "ui_RQ3_joinAddress", "", CVAR_ARCHIVE}, {&ui_RQ3_joinAddress, "ui_RQ3_joinAddress", "", CVAR_ARCHIVE},
{&ui_RQ3_joinPort, "ui_RQ3_joinPort", "27960", CVAR_ARCHIVE}, {&ui_RQ3_joinPort, "ui_RQ3_joinPort", "27960", CVAR_ARCHIVE},
//Makro - demo name //Makro - demo name
{&ui_RQ3_demoName, "ui_RQ3_demoName", "", 0} {&ui_RQ3_demoName, "ui_RQ3_demoName", "", 0},
//Makro - matchmode settings
{&ui_RQ3_timelimit, "timelimit", "0", 0},
{&ui_RQ3_roundlimit, "g_RQ3_roundlimit", "0", 0},
{&ui_RQ3_roundtimelimit, "g_RQ3_roundtimelimit", "0", 0},
{&ui_RQ3_fraglimit, "fraglimit", "0", 0},
{&ui_RQ3_maxplayers, "g_RQ3_maxplayers", "0", 0},
{&ui_RQ3_forceteamtalk, "g_RQ3_forceteamtalk", "0", 0},
{&ui_RQ3_limchasecam, "g_RQ3_limchasecam", "0", 0},
{&ui_RQ3_tgren, "g_RQ3_tgren", "0", 0},
{&ui_RQ3_friendlyFire, "g_friendlyFire", "0", 0}
}; };
// bk001129 - made static to avoid aliasing // bk001129 - made static to avoid aliasing