Added clientNum info to the UI; made ref kick and referee ui scripts

use client nums instead of names
This commit is contained in:
Andrei Drexler 2002-08-30 17:22:29 +00:00
parent 3fffb5e683
commit 66f9ab4b5f
3 changed files with 13 additions and 28 deletions

View file

@ -6,32 +6,6 @@
--------------------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\RSP2AC.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_main.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2AC.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2AD.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\RSP2AD.tmp"
<h3>Output Window</h3>
Compiling...
ui_main.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp

View file

@ -5,6 +5,10 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.20 2002/08/30 17:22:28 makro
// Added clientNum info to the UI; made ref kick and referee ui scripts
// use client nums instead of names
//
// Revision 1.19 2002/08/30 15:09:43 makro // Revision 1.19 2002/08/30 15:09:43 makro
// MM UI // MM UI
// //
@ -890,6 +894,8 @@ typedef struct {
char playerNames[MAX_CLIENTS][MAX_NAME_LENGTH]; char playerNames[MAX_CLIENTS][MAX_NAME_LENGTH];
char teamNames[MAX_CLIENTS][MAX_NAME_LENGTH]; char teamNames[MAX_CLIENTS][MAX_NAME_LENGTH];
int teamClientNums[MAX_CLIENTS]; int teamClientNums[MAX_CLIENTS];
//Makro - added
int clientNums[MAX_CLIENTS];
int mapCount; int mapCount;
mapInfo mapList[MAX_MAPS]; mapInfo mapList[MAX_MAPS];

View file

@ -5,6 +5,10 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// 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
//
// Revision 1.47 2002/08/30 15:09:43 makro // Revision 1.47 2002/08/30 15:09:43 makro
// MM UI // MM UI
// //
@ -2391,6 +2395,7 @@ static void UI_BuildPlayerList()
Q_strncpyz(uiInfo.playerNames[uiInfo.playerCount], Info_ValueForKey(info, "n"), Q_strncpyz(uiInfo.playerNames[uiInfo.playerCount], Info_ValueForKey(info, "n"),
MAX_NAME_LENGTH); MAX_NAME_LENGTH);
Q_CleanStr(uiInfo.playerNames[uiInfo.playerCount]); Q_CleanStr(uiInfo.playerNames[uiInfo.playerCount]);
uiInfo.clientNums[uiInfo.playerCount] = n;
uiInfo.playerCount++; uiInfo.playerCount++;
team2 = atoi(Info_ValueForKey(info, "t")); team2 = atoi(Info_ValueForKey(info, "t"));
if (team2 == team) { if (team2 == team) {
@ -4092,13 +4097,13 @@ static void UI_RunMenuScript(char **args)
} else if (Q_stricmp(name, "refKick") == 0) { } else if (Q_stricmp(name, "refKick") == 0) {
if (uiInfo.playerIndex >= 0 && uiInfo.playerIndex < uiInfo.playerCount) { if (uiInfo.playerIndex >= 0 && uiInfo.playerIndex < uiInfo.playerCount) {
trap_Cmd_ExecuteText(EXEC_APPEND, trap_Cmd_ExecuteText(EXEC_APPEND,
va("ref kick %s\n", uiInfo.playerNames[uiInfo.playerIndex])); va("ref kick %i\n", uiInfo.clientNums[uiInfo.playerIndex]));
} }
//Makro - captain command - referee //Makro - captain command - referee
} else if (Q_stricmp(name, "captainRef") == 0) { } else if (Q_stricmp(name, "captainRef") == 0) {
if (uiInfo.playerIndex >= 0 && uiInfo.playerIndex < uiInfo.playerCount) { if (uiInfo.playerIndex >= 0 && uiInfo.playerIndex < uiInfo.playerCount) {
trap_Cmd_ExecuteText(EXEC_APPEND, trap_Cmd_ExecuteText(EXEC_APPEND,
va("referee %s\n", uiInfo.playerNames[uiInfo.playerIndex])); va("referee %i\n", uiInfo.clientNums[uiInfo.playerIndex]));
} }
//Makro - ref login //Makro - ref login
} else if (Q_stricmp(name, "refLogin") == 0) { } else if (Q_stricmp(name, "refLogin") == 0) {