rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-03-13 22:22:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Weapon/join menu tweaks

Browse source
This commit is contained in:
Andrei Drexler 2002-05-29 13:30:19 +00:00
parent de0df27cc8
commit e8cdff3c96
4 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reaction/ta_ui/ta_ui.plg
View file

@ -6,32 +6,6 @@
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP390.tmp" with contents
[
/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /FD /c
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_gameinfo.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP390.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP391.tmp" with contents
[
/nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"../Release/uix86.dll" /implib:"Release_TA/uix86.lib"
.\Release_TA\bg_misc.obj
.\Release_TA\q_math.obj
.\Release_TA\q_shared.obj
.\Release_TA\ui_atoms.obj
.\Release_TA\ui_gameinfo.obj
.\Release_TA\ui_main.obj
.\Release_TA\ui_players.obj
.\Release_TA\ui_shared.obj
.\Release_TA\ui_syscalls.obj
.\Release_TA\ui_util.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP391.tmp"
<h3>Output Window</h3>
Compiling...
ui_gameinfo.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp

8
reaction/ta_ui/ui_atoms.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.11 2002/05/29 13:30:19 makro
// Weapon/join menu tweaks
//
// Revision 1.10 2002/04/30 11:56:54 makro
// Stuff
//
@ -421,10 +424,7 @@ qboolean UI_ConsoleCommand( int realTime ) {
//Makro - join menu
if ( Q_stricmp (cmd, "ui_RQ3_joinTeam") == 0 ) {
if ( trap_Cvar_VariableValue("g_gametype") >= GT_TEAM)
_UI_SetActiveMenu(UIMENU_RQ3_JOIN);
else
Com_Printf("Not playing a team-based game.\n");
_UI_SetActiveMenu(UIMENU_RQ3_JOIN);
return qtrue;
}

5
reaction/ta_ui/ui_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.11 2002/05/29 13:30:19 makro
// Weapon/join menu tweaks
//
// Revision 1.10 2002/05/19 15:45:03 makro
// "Specify server" option
//
@ -147,6 +150,8 @@ extern vmCvar_t ui_RQ3_modelCommand;
extern vmCvar_t ui_RQ3_teamCount1;
extern vmCvar_t ui_RQ3_teamCount2;
extern vmCvar_t ui_RQ3_numSpectators;
//Makro - weapon menu after joining a team
extern vmCvar_t ui_RQ3_weapAfterJoin;
//Makro - specify server option
extern vmCvar_t ui_RQ3_joinAddress;
extern vmCvar_t ui_RQ3_joinPort;

17
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.24 2002/05/29 13:30:19 makro
// Weapon/join menu tweaks
//
// Revision 1.23 2002/05/19 21:31:22 makro
// Stuff
//
@ -3716,6 +3719,14 @@ static void UI_RunMenuScript(char **args) {
//trap_Cmd_ExecuteText( EXEC_NOW, "quit");
//Makro - maybe a wait command will make the music volume get saved before exiting
trap_Cmd_ExecuteText( EXEC_APPEND, "wait ; quit\n");
//Makro - weapon menu after joining a team
} else if (Q_stricmp(name, "weapAfterJoin") == 0) {
//only in teamplay
if (trap_Cvar_VariableValue("g_gametype") == GT_TEAMPLAY) {
if (ui_RQ3_weapAfterJoin.integer) {
_UI_SetActiveMenu(UIMENU_RQ3_WEAPON);
}
}
} else if (Q_stricmp(name, "Controls") == 0) {
trap_Cvar_Set( "cl_paused", "1" );
trap_Key_SetCatcher( KEYCATCH_UI );
@ -5776,7 +5787,11 @@ void _UI_SetActiveMenu( uiMenuCommand_t menu ) {
trap_Key_SetCatcher( KEYCATCH_UI );
UI_BuildPlayerList();
Menus_CloseAll();
Menus_ActivateByName("ingame_join");
if ( trap_Cvar_VariableValue("g_gametype") >= GT_TEAM) {
Menus_ActivateByName("ingame_join");
} else {
Menus_ActivateByName("ingame_join_dm");
}
return;
case UIMENU_RQ3_TKOK:
trap_Cvar_Set( "cl_paused", "1" );