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

Small fixes

Browse source
This commit is contained in:
Andrei Drexler 2002-09-01 12:30:29 +00:00
parent 66f9ab4b5f
commit a5d1573f5c
2 changed files with 170 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
reaction/ta_ui/ta_ui.plg
View file

@ -3,9 +3,163 @@
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: cgame - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP375.tmp" with contents
[
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c
"C:\Games\Quake3\rq3source\reaction\cgame\cg_draw.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP375.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP376.tmp" with contents
[
/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib"
.\Release\bg_misc.obj
.\Release\bg_pmove.obj
.\Release\bg_slidemove.obj
.\Release\cg_atmospheric.obj
.\Release\cg_consolecmds.obj
.\Release\cg_draw.obj
.\Release\cg_drawtools.obj
.\Release\cg_effects.obj
.\Release\cg_ents.obj
.\Release\cg_event.obj
.\Release\cg_info.obj
.\Release\cg_localents.obj
.\Release\cg_main.obj
.\Release\cg_marks.obj
.\Release\cg_players.obj
.\Release\cg_playerstate.obj
.\Release\cg_predict.obj
.\Release\cg_scoreboard.obj
.\Release\cg_servercmds.obj
.\Release\cg_snapshot.obj
.\Release\cg_syscalls.obj
.\Release\cg_view.obj
.\Release\cg_weapons.obj
.\Release\q_math.obj
.\Release\q_shared.obj
.\Release\ui_shared.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP376.tmp"
<h3>Output Window</h3>
Compiling...
cg_draw.c
Linking...
Creating library Release/cgamex86.lib and object Release/cgamex86.exp
<h3>Results</h3>
cgamex86.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: game - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP37A.tmp" with contents
[
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c
"C:\Games\Quake3\rq3source\reaction\game\g_active.c"
"C:\Games\Quake3\rq3source\reaction\game\g_client.c"
"C:\Games\Quake3\rq3source\reaction\game\g_teamplay.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP37A.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP37B.tmp" with contents
[
kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib"
\reactionoutput\ai_chat.obj
\reactionoutput\ai_cmd.obj
\reactionoutput\ai_dmnet.obj
\reactionoutput\ai_dmq3.obj
\reactionoutput\ai_main.obj
\reactionoutput\ai_team.obj
\reactionoutput\ai_vcmd.obj
\reactionoutput\bg_misc.obj
\reactionoutput\bg_pmove.obj
\reactionoutput\bg_slidemove.obj
\reactionoutput\g_active.obj
\reactionoutput\g_arenas.obj
\reactionoutput\g_bot.obj
\reactionoutput\g_client.obj
\reactionoutput\g_cmds.obj
\reactionoutput\g_combat.obj
\reactionoutput\g_fileio.obj
\reactionoutput\g_items.obj
\reactionoutput\g_main.obj
\reactionoutput\g_matchmode.obj
\reactionoutput\g_mem.obj
\reactionoutput\g_misc.obj
\reactionoutput\g_missile.obj
\reactionoutput\g_mover.obj
\reactionoutput\g_session.obj
\reactionoutput\g_spawn.obj
\reactionoutput\g_svcmds.obj
\reactionoutput\g_syscalls.obj
\reactionoutput\g_target.obj
\reactionoutput\g_team.obj
\reactionoutput\g_teamplay.obj
\reactionoutput\g_trigger.obj
\reactionoutput\g_utils.obj
\reactionoutput\g_weapon.obj
\reactionoutput\q_math.obj
\reactionoutput\q_shared.obj
\reactionoutput\rxn_game.obj
\reactionoutput\zcam.obj
\reactionoutput\zcam_target.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP37B.tmp"
<h3>Output Window</h3>
Compiling...
g_active.c
g_client.c
g_teamplay.c
C:\Games\Quake3\rq3source\reaction\game\g_client.c(1687) : warning C4701: local variable 'classname' may be used without having been initialized
Linking...
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
<h3>Results</h3>
qagamex86.dll - 0 error(s), 1 warning(s)
<h3>
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP37F.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_atoms.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_gameinfo.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_players.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_syscalls.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP37F.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP380.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\RSP380.tmp"
<h3>Output Window</h3>
Compiling...
ui_atoms.c
ui_gameinfo.c
ui_main.c
ui_players.c
ui_syscalls.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp

25
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.49 2002/09/01 12:30:29 makro
// Small fixes
//
// Revision 1.48 2002/08/30 17:22:29 makro
// Added clientNum info to the UI; made ref kick and referee ui scripts
// use client nums instead of names
@ -2322,29 +2325,30 @@ void UI_BuildIngameServerInfoList()
int matchmode = atoi(Info_ValueForKey(info, "g_RQ3_matchmode"));
int limit = atoi(Info_ValueForKey(info, "timelimit"));
AddIngameLine("RQ3 Version", Info_ValueForKey(info, "g_RQ3_version"));
AddIngameLine("Host name", Info_ValueForKey(info, "sv_hostname"));
AddIngameLine("Map name", Info_ValueForKey(info, "mapname"));
AddIngameLine("Gametype", (char*)teamArenaGameNames[gametype]);
AddIngameLine("Time limit", (limit !=0 ) ? va("%s", limit) : "None");
AddIngameLine("Time limit", (limit !=0 ) ? va("%i", limit) : "None");
switch (gametype) {
case GT_TEAMPLAY:
{
limit = atoi(Info_ValueForKey(info, "g_RQ3_roundlimit"));
AddIngameLine("Round limit", (limit !=0 ) ? va("%s", limit) : "None");
AddIngameLine("Round limit", (limit !=0 ) ? va("%i", limit) : "None");
limit = atoi(Info_ValueForKey(info, "g_RQ3_roundtimelimit"));
AddIngameLine("Round time limit", (limit !=0 ) ? va("%s", limit) : "None");
AddIngameLine("Round time limit", (limit !=0 ) ? va("%i", limit) : "None");
AddIngameLine("Team 1", va("%s (%s)", Info_ValueForKey(info, "g_RQ3_team1Name"), Info_ValueForKey(info, "g_RQ3_team1model")));
AddIngameLine("Team 2", va("%s (%s)", Info_ValueForKey(info, "g_RQ3_team2Name"), Info_ValueForKey(info, "g_RQ3_team2model")));
}
case GT_CTF:
{
limit = atoi(Info_ValueForKey(info, "capturelimit"));
AddIngameLine("Capture limit", (limit !=0 ) ? va("%s", limit) : "None");
AddIngameLine("Capture limit", (limit !=0 ) ? va("%i", limit) : "None");
}
default:
{
limit = atoi(Info_ValueForKey(info, "fraglimit"));
AddIngameLine("Frag limit", (limit !=0 ) ? va("%s", limit) : "None");
AddIngameLine("Frag limit", (limit !=0 ) ? va("%i", limit) : "None");
}
}
AddIngameLine("Match mode", (matchmode != 0) ? "On" : "Off");
@ -2362,7 +2366,7 @@ void UI_BuildIngameServerInfoList()
AddIngameLine("Bot/min players", Info_ValueForKey(info, "bot_minplayers"));
AddIngameLine("Password required", (atoi(Info_ValueForKey(info, "g_needPass")) != 0) ? "Yes" : "No");
AddIngameLine("Protocol", Info_ValueForKey(info, "protocol"));
AddIngameLine("Version", Info_ValueForKey(info, "version"));
AddIngameLine("Q3 Version", Info_ValueForKey(info, "version"));
}
}
@ -2440,15 +2444,18 @@ static void UI_DrawServerRefreshDate(rectDef_t * rect, float scale, vec4_t color
{
if (uiInfo.serverStatus.refreshActive) {
vec4_t lowLight, newColor;
int count = trap_LAN_GetServerCount(ui_netSource.integer);
lowLight[0] = 0.8 * color[0];
lowLight[1] = 0.8 * color[1];
lowLight[2] = 0.8 * color[2];
lowLight[3] = 0.8 * color[3];
if (count < 0) {
count = 0;
}
LerpColor(color, lowLight, newColor, 0.5 + 0.5 * sin(uiInfo.uiDC.realTime / PULSE_DIVISOR));
Text_Paint(rect->x, rect->y, scale, newColor,
va("Getting info for %d servers (ESC to cancel)",
trap_LAN_GetServerCount(ui_netSource.integer)), 0, 0, textStyle);
va("Getting info for %d servers (ESC to cancel)", count), 0, 0, textStyle);
} else {
char buff[64];
@ -7311,7 +7318,7 @@ static void UI_StartServerRefresh(qboolean full)
//Makro - added leading zero's
//trap_Cvar_Set( va("ui_lastServerRefresh_%i", ui_netSource.integer), va("%s-%i, %i at %i:%i", MonthAbbrev[q.tm_mon],q.tm_mday, 1900+q.tm_year,q.tm_hour,q.tm_min));
trap_Cvar_Set(va("ui_lastServerRefresh_%i", ui_netSource.integer),
va("%s-%i, %2d at %2d:%2d", MonthAbbrev[q.tm_mon], q.tm_mday, 1900 + q.tm_year, q.tm_hour,
va("%s-%i, %d at %02i:%02i", MonthAbbrev[q.tm_mon], q.tm_mday, 1900 + q.tm_year, q.tm_hour,
q.tm_min));
if (!full) {