summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_consolecmds.c7
-rw-r--r--src/cgame/cg_event.c10
-rw-r--r--src/ui/ui_main.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index c36a57b8..f939ca82 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -328,10 +328,11 @@ qboolean CG_ConsoleCommand( void ) {
cmd = CG_Argv(0);
//TA: ugly hacky special case
- if( !Q_stricmp( cmd, "cmenu" ) )
+ if( !Q_stricmp( cmd, "ui_menu" ) )
{
arg1 = CG_Argv( 1 );
- CG_ClientMenu( arg1 );
+ /*CG_ClientMenu( arg1 );*/
+ trap_SendConsoleCommand( va( "menu %s\n", arg1 ) );
return qtrue;
}
@@ -405,6 +406,6 @@ void CG_InitConsoleCommands( void ) {
trap_AddCommand ("menu");
trap_AddCommand ("defmenu");
trap_AddCommand ("undefmenu");
- trap_AddCommand ("cmenu");
+ trap_AddCommand ("ui_menu");
trap_AddCommand ("loaddefered"); // spelled wrong, but not changing for demo
}
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index ea3aca78..7aebd973 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -426,12 +426,12 @@ void CG_Menu( int eventParm )
switch( eventParm )
{
- case MN_TEAM: trap_SendConsoleCommand( "menu tremulous_team\n" ); break;
+ case MN_TEAM: trap_SendConsoleCommand( "menu tremulous_teamselect\n" ); break;
case MN_D_CLASS: trap_SendConsoleCommand( "menu tremulous_alienclass\n" ); break;
- case MN_H_SPAWN: trap_SendConsoleCommand( "menu hsitemmenu\n" ); break;
- case MN_D_BUILD: trap_SendConsoleCommand( "menu dbuildmenu\n" ); break;
- case MN_H_BUILD: trap_SendConsoleCommand( "menu hbuildmenu\n" ); break;
- case MN_H_MCU: trap_SendConsoleCommand( "menu hmcumenu\n" ); break;
+ case MN_H_SPAWN: trap_SendConsoleCommand( "menu tremulous_humanitem\n" ); break;
+ case MN_D_BUILD: trap_SendConsoleCommand( "menu tremulous_alienbuild\n" ); break;
+ case MN_H_BUILD: trap_SendConsoleCommand( "menu tremulous_humanbuild\n" ); break;
+ case MN_H_MCU: trap_SendConsoleCommand( "menu tremulous_humanmcu\n" ); break;
case MN_H_BANK: trap_SendConsoleCommand( "menu hbankmenu\n" ); break;
case MN_H_NOROOM: trap_SendConsoleCommand( "menu hnoroom\n" ); break;
case MN_H_NOPOWER: trap_SendConsoleCommand( "menu hnopower\n" ); break;
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 0785fe20..0d545dfc 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -184,7 +184,7 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a
UI_DrawConnectScreen( arg0 );
return 0;
case UI_HASUNIQUECDKEY: // mod authors need to observe this
- return qtrue; // bk010117 - change this to qfalse for mods!
+ return qfalse; // bk010117 - change this to qfalse for mods!
}