rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug in the server browser

This commit is contained in:
Andrei Drexler 2002-06-02 22:22:04 +00:00
parent fbe1e0d0fb
commit b5cad6bb20
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
reaction/ta_ui/ta_ui.plg
View File

@ -6,13 +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\RSP111.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A0.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\ta_ui\ui_shared.c" "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
] ]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP111.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A0.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP112.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A1.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" /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\bg_misc.obj
@ -26,10 +26,10 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP112.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\RSP112.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A1.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
ui_shared.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

24
reaction/ta_ui/ui_main.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.26 2002/06/02 22:22:04 makro
// Bug in the server browser
//
// Revision 1.25 2002/06/02 00:15:07 makro // Revision 1.25 2002/06/02 00:15:07 makro
// Small fixes // Small fixes
// //
@ -132,7 +135,6 @@ static const serverFilter_t serverFilters[] = {
{"Weapons Factory Arena", "wfa" }, {"Weapons Factory Arena", "wfa" },
{"OSP", "osp" }, {"OSP", "osp" },
{"All", "" },*/ {"All", "" },*/
{"Reaction", "reaction" },
//Makro - hack !!! //Makro - hack !!!
{"Reaction", "reaction" } {"Reaction", "reaction" }
}; };
@ -2819,18 +2821,19 @@ static qboolean UI_NetFilter_HandleKey(int flags, float *special, int key) {
//Makro - left/right support //Makro - left/right support
if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_ENTER || key == K_KP_ENTER || key == K_LEFTARROW || key == K_RIGHTARROW) { if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_ENTER || key == K_KP_ENTER || key == K_LEFTARROW || key == K_RIGHTARROW) {
if (key == K_MOUSE2 || key == K_LEFTARROW) { if (key == K_MOUSE2 || key == K_LEFTARROW) {
ui_serverFilterType.integer--; ui_serverFilterType.integer--;
} else { } else {
ui_serverFilterType.integer++; ui_serverFilterType.integer++;
} }
if (ui_serverFilterType.integer >= numServerFilters) { if (ui_serverFilterType.integer >= numServerFilters) {
ui_serverFilterType.integer = 0; ui_serverFilterType.integer = 0;
} else if (ui_serverFilterType.integer < 0) { } else if (ui_serverFilterType.integer < 0) {
ui_serverFilterType.integer = numServerFilters - 1; ui_serverFilterType.integer = numServerFilters - 1;
} }
UI_BuildServerDisplayList(qtrue);
UI_BuildServerDisplayList(qtrue);
return qtrue; return qtrue;
} }
return qfalse; return qfalse;
@ -4213,12 +4216,15 @@ static void UI_BuildServerDisplayList(qboolean force) {
} }
} }
if (ui_serverFilterType.integer > 0) { //Makro - changed check
//if (ui_serverFilterType.integer > 0) {
if (serverFilters[ui_serverFilterType.integer].basedir[0]) {
if (Q_stricmp(Info_ValueForKey(info, "game"), serverFilters[ui_serverFilterType.integer].basedir) != 0) { if (Q_stricmp(Info_ValueForKey(info, "game"), serverFilters[ui_serverFilterType.integer].basedir) != 0) {
trap_LAN_MarkServerVisible(ui_netSource.integer, i, qfalse); trap_LAN_MarkServerVisible(ui_netSource.integer, i, qfalse);
continue; continue;
} }
} }
// make sure we never add a favorite server twice // make sure we never add a favorite server twice
if (ui_netSource.integer == AS_FAVORITES) { if (ui_netSource.integer == AS_FAVORITES) {
UI_RemoveServerFromDisplayList(i); UI_RemoveServerFromDisplayList(i);