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

"Specify server" option

Browse source
This commit is contained in:
Andrei Drexler 2002-05-19 15:45:03 +00:00
parent 57fc38ae14
commit dfa85b02a9
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reaction/ta_ui/ta_ui.plg
View file

@ -6,14 +6,13 @@
--------------------Configuration: ui - Win32 Release TA-------------------- --------------------Configuration: ui - Win32 Release TA--------------------
</h3> </h3>
<h3>Command Lines</h3> <h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP520.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B7.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 /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\game\bg_misc.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c" "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
] ]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP520.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B7.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP521.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B8.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:"uix86.dll" /implib:"Release_TA/uix86.lib" /nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"uix86.dll" /implib:"Release_TA/uix86.lib"
.\Release_TA\bg_misc.obj .\Release_TA\bg_misc.obj
@ -27,10 +26,9 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP521.tmp" with conte
.\Release_TA\ui_syscalls.obj .\Release_TA\ui_syscalls.obj
.\Release_TA\ui_util.obj .\Release_TA\ui_util.obj
] ]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP521.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B8.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
bg_misc.c
ui_main.c ui_main.c
Linking... Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp

6
reaction/ta_ui/ui_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.10 2002/05/19 15:45:03 makro
// "Specify server" option
//
// Revision 1.9 2002/04/22 18:40:58 makro // Revision 1.9 2002/04/22 18:40:58 makro
// Model validation // Model validation
// //
@ -144,6 +147,9 @@ extern vmCvar_t ui_RQ3_modelCommand;
extern vmCvar_t ui_RQ3_teamCount1; extern vmCvar_t ui_RQ3_teamCount1;
extern vmCvar_t ui_RQ3_teamCount2; extern vmCvar_t ui_RQ3_teamCount2;
extern vmCvar_t ui_RQ3_numSpectators; extern vmCvar_t ui_RQ3_numSpectators;
//Makro - specify server option
extern vmCvar_t ui_RQ3_joinAddress;
extern vmCvar_t ui_RQ3_joinPort;
// //

22
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.22 2002/05/19 15:45:03 makro
// "Specify server" option
//
// Revision 1.21 2002/05/15 12:48:17 makro // Revision 1.21 2002/05/15 12:48:17 makro
// Fixed a bug with bots + teams // Fixed a bug with bots + teams
// //
@ -118,8 +121,8 @@ static const serverFilter_t serverFilters[] = {
{"Rocket Arena", "arena" }, {"Rocket Arena", "arena" },
{"Alliance", "alliance20" }, {"Alliance", "alliance20" },
{"Weapons Factory Arena", "wfa" }, {"Weapons Factory Arena", "wfa" },
{"OSP", "osp" },*/ {"OSP", "osp" },
{"All", "" }, {"All", "" },*/
{"Reaction", "reaction" } {"Reaction", "reaction" }
}; };
@ -3688,6 +3691,12 @@ static void UI_RunMenuScript(char **args) {
trap_LAN_GetServerAddressString(ui_netSource.integer, uiInfo.serverStatus.displayServers[uiInfo.serverStatus.currentServer], buff, 1024); trap_LAN_GetServerAddressString(ui_netSource.integer, uiInfo.serverStatus.displayServers[uiInfo.serverStatus.currentServer], buff, 1024);
trap_Cmd_ExecuteText( EXEC_APPEND, va( "connect %s\n", buff ) ); trap_Cmd_ExecuteText( EXEC_APPEND, va( "connect %s\n", buff ) );
} }
//Makro - specify server
} else if (Q_stricmp(name, "JoinSpecifiedServer") == 0) {
trap_Cvar_Set("cg_thirdPerson", "0");
trap_Cvar_Set("cg_cameraOrbit", "0");
trap_Cvar_Set("ui_singlePlayerActive", "0");
trap_Cmd_ExecuteText( EXEC_APPEND, va( "connect %s:%i\n", ui_RQ3_joinAddress.string, ui_RQ3_joinPort.integer) );
} else if (Q_stricmp(name, "FoundPlayerJoinServer") == 0) { } else if (Q_stricmp(name, "FoundPlayerJoinServer") == 0) {
trap_Cvar_Set("ui_singlePlayerActive", "0"); trap_Cvar_Set("ui_singlePlayerActive", "0");
if (uiInfo.currentFoundPlayerServer >= 0 && uiInfo.currentFoundPlayerServer < uiInfo.numFoundPlayerServers) { if (uiInfo.currentFoundPlayerServer >= 0 && uiInfo.currentFoundPlayerServer < uiInfo.numFoundPlayerServers) {
@ -6124,7 +6133,9 @@ vmCvar_t ui_RQ3_weapAfterJoin;
vmCvar_t ui_RQ3_teamCount1; vmCvar_t ui_RQ3_teamCount1;
vmCvar_t ui_RQ3_teamCount2; vmCvar_t ui_RQ3_teamCount2;
vmCvar_t ui_RQ3_numSpectators; vmCvar_t ui_RQ3_numSpectators;
//Makro - specify server option
vmCvar_t ui_RQ3_joinAddress;
vmCvar_t ui_RQ3_joinPort;
// bk001129 - made static to avoid aliasing // bk001129 - made static to avoid aliasing
@ -6255,7 +6266,10 @@ static cvarTable_t cvarTable[] = {
//Makro - team counts //Makro - team counts
{ &ui_RQ3_teamCount1, "g_RQ3_teamCount1", "0", 0}, { &ui_RQ3_teamCount1, "g_RQ3_teamCount1", "0", 0},
{ &ui_RQ3_teamCount2, "g_RQ3_teamCount2", "0", 0}, { &ui_RQ3_teamCount2, "g_RQ3_teamCount2", "0", 0},
{ &ui_RQ3_numSpectators, "g_RQ3_numSpectators", "0", 0} { &ui_RQ3_numSpectators, "g_RQ3_numSpectators", "0", 0},
//Makro - specify server option
{ &ui_RQ3_joinAddress, "ui_RQ3_joinAddress", "", CVAR_ARCHIVE},
{ &ui_RQ3_joinPort, "ui_RQ3_joinPort", "27960", CVAR_ARCHIVE}
}; };
// bk001129 - made static to avoid aliasing // bk001129 - made static to avoid aliasing