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

Fixed a bug with bots + teams

Browse source
This commit is contained in:
Andrei Drexler 2002-05-15 12:48:17 +00:00
parent 1762754b07
commit fc9000fcd4
2 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reaction/ta_ui/ta_ui.plg
View file

@ -6,22 +6,14 @@
--------------------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\RSP196A.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP520.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\game\bg_misc.c"
"C:\Games\Quake3\rq3source\reaction\game\q_math.c"
"C:\Games\Quake3\rq3source\reaction\game\q_shared.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_main.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_players.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_shared.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_syscalls.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_util.c"
] ]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP196A.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP520.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP196B.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP521.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
@ -35,19 +27,11 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP196B.tmp" with cont
.\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\RSP196B.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP521.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
bg_misc.c bg_misc.c
q_math.c
q_shared.c
ui_atoms.c
ui_gameinfo.c
ui_main.c ui_main.c
ui_players.c
ui_shared.c
ui_syscalls.c
ui_util.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

21
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.21 2002/05/15 12:48:17 makro
// Fixed a bug with bots + teams
//
// Revision 1.20 2002/05/12 22:15:13 makro // Revision 1.20 2002/05/12 22:15:13 makro
// Support for ignore/unignore // Support for ignore/unignore
// //
@ -3514,22 +3517,32 @@ static void UI_RunMenuScript(char **args) {
for (i = 0; i < PLAYERS_PER_TEAM; i++) { for (i = 0; i < PLAYERS_PER_TEAM; i++) {
int bot = trap_Cvar_VariableValue( va("ui_blueteam%i", i+1)); int bot = trap_Cvar_VariableValue( va("ui_blueteam%i", i+1));
if (bot > 1) { if (bot > 1) {
//Makro - using bot list instead of character list //Makro - using bot list instead of character list; new code below
//if (ui_actualNetGameType.integer >= GT_TEAM) { //if (ui_actualNetGameType.integer >= GT_TEAM) {
// Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Blue"); // Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Blue");
//} else { //} else {
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill); // Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
//} //}
if (ui_actualNetGameType.integer >= GT_TEAM) {
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f blue\n", UI_GetBotNameByNumber(bot-2), skill);
} else {
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
}
trap_Cmd_ExecuteText( EXEC_APPEND, buff ); trap_Cmd_ExecuteText( EXEC_APPEND, buff );
} }
bot = trap_Cvar_VariableValue( va("ui_redteam%i", i+1)); bot = trap_Cvar_VariableValue( va("ui_redteam%i", i+1));
if (bot > 1) { if (bot > 1) {
//Makro - using bot list instead of character list //Makro - using bot list instead of character list; new code below
//if (ui_actualNetGameType.integer >= GT_TEAM) { //if (ui_actualNetGameType.integer >= GT_TEAM) {
// Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Red"); // Com_sprintf( buff, sizeof(buff), "addbot %s %f %s\n", uiInfo.characterList[bot-2].name, skill, "Red");
//} else { //} else {
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill); // Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
//} //}
if (ui_actualNetGameType.integer >= GT_TEAM) {
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f red\n", UI_GetBotNameByNumber(bot-2), skill);
} else {
Com_sprintf( buff, sizeof(buff), "wait; addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
}
trap_Cmd_ExecuteText( EXEC_APPEND, buff ); trap_Cmd_ExecuteText( EXEC_APPEND, buff );
} }
} }