diff --git a/reaction/ta_ui/ta_ui.plg b/reaction/ta_ui/ta_ui.plg
index d9b8cc98..7e1fd2ff 100644
--- a/reaction/ta_ui/ta_ui.plg
+++ b/reaction/ta_ui/ta_ui.plg
@@ -6,13 +6,13 @@
--------------------Configuration: ui - Win32 Release TA--------------------
Command Lines
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP114.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F2.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_shared.c"
+"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP114.tmp"
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP115.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F2.tmp"
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F3.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
@@ -26,10 +26,10 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP115.tmp" with conte
.\Release_TA\ui_syscalls.obj
.\Release_TA\ui_util.obj
]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP115.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1F3.tmp"
Output Window
Compiling...
-ui_shared.c
+ui_main.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
diff --git a/reaction/ta_ui/ui_local.h b/reaction/ta_ui/ui_local.h
index 0a20d2f0..a6ce5799 100644
--- a/reaction/ta_ui/ui_local.h
+++ b/reaction/ta_ui/ui_local.h
@@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.12 2002/06/09 15:35:23 makro
+// "wait" command is no longer executed before adding a bot
+// when starting a server from the UI
+//
// Revision 1.11 2002/05/29 13:30:19 makro
// Weapon/join menu tweaks
//
@@ -155,6 +159,8 @@ extern vmCvar_t ui_RQ3_weapAfterJoin;
//Makro - specify server option
extern vmCvar_t ui_RQ3_joinAddress;
extern vmCvar_t ui_RQ3_joinPort;
+//Makro - demo name
+extern vmCvar_t ui_RQ3_demoName;
//
diff --git a/reaction/ta_ui/ui_main.c b/reaction/ta_ui/ui_main.c
index b2502fea..37b780d6 100644
--- a/reaction/ta_ui/ui_main.c
+++ b/reaction/ta_ui/ui_main.c
@@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.29 2002/06/09 15:35:23 makro
+// "wait" command is no longer executed before adding a bot
+// when starting a server from the UI
+//
// Revision 1.28 2002/06/05 19:17:07 makro
// Squashed some bugs :)
//
@@ -3560,9 +3564,9 @@ static void UI_RunMenuScript(char **args) {
// 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);
+ Com_sprintf( buff, sizeof(buff), "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);
+ Com_sprintf( buff, sizeof(buff), "addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
}
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
}
@@ -3575,9 +3579,9 @@ static void UI_RunMenuScript(char **args) {
// 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);
+ Com_sprintf( buff, sizeof(buff), "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);
+ Com_sprintf( buff, sizeof(buff), "addbot %s %f \n", UI_GetBotNameByNumber(bot-2), skill);
}
trap_Cmd_ExecuteText( EXEC_APPEND, buff );
}
@@ -3824,6 +3828,9 @@ static void UI_RunMenuScript(char **args) {
int index = (int) (random() * (float) (UI_GetNumBots() - 1));
//Makro - don't add the bot instantly
trap_Cmd_ExecuteText( EXEC_APPEND, va("wait; addbot %s %i %s\n", UI_GetBotNameByNumber(index), uiInfo.skillIndex+1, (uiInfo.redBlue == 0) ? "Red" : "Blue") );
+ //Makro - record a demo
+ } else if (Q_stricmp(name, "recordDemo") == 0) {
+ trap_Cmd_ExecuteText( EXEC_APPEND, va("record %s", ui_RQ3_demoName.string) );
} else if (Q_stricmp(name, "addFavorite") == 0) {
if (ui_netSource.integer != AS_FAVORITES) {
char name[MAX_NAME_LENGTH];
@@ -6190,6 +6197,8 @@ vmCvar_t ui_RQ3_numSpectators;
//Makro - specify server option
vmCvar_t ui_RQ3_joinAddress;
vmCvar_t ui_RQ3_joinPort;
+//Makro - demo name
+vmCvar_t ui_RQ3_demoName;
// bk001129 - made static to avoid aliasing
@@ -6323,7 +6332,9 @@ static cvarTable_t cvarTable[] = {
{ &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}
+ { &ui_RQ3_joinPort, "ui_RQ3_joinPort", "27960", CVAR_ARCHIVE},
+ //Makro - demo name
+ { &ui_RQ3_demoName, "ui_RQ3_demoName", "", 0}
};
// bk001129 - made static to avoid aliasing