summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--depend21
-rw-r--r--src/cgame/cg_consolecmds.c7
-rw-r--r--src/cgame/cg_event.c10
-rw-r--r--src/ui/ui_main.c2
4 files changed, 31 insertions, 9 deletions
diff --git a/depend b/depend
index 65adfa50..7339fb25 100644
--- a/depend
+++ b/depend
@@ -19,6 +19,9 @@ releasei386-glibc/game/g_buildable.o: ./src/game/g_buildable.c src/game/g_local.
releasei386-glibc/game/g_client.o: ./src/game/g_client.c src/game/g_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/game/bg_public.h \
src/game/g_public.h src/game/g_team.h
+releasei386-glibc/game/g_cmds.o: ./src/game/g_cmds.c src/game/g_local.h src/game/q_shared.h \
+ src/game/surfaceflags.h src/game/bg_public.h src/game/g_public.h \
+ src/game/g_team.h src/game/../../ui/menudef.h
releasei386-glibc/game/g_combat.o: ./src/game/g_combat.c src/game/g_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/game/bg_public.h \
src/game/g_public.h src/game/g_team.h
@@ -91,6 +94,9 @@ debugi386-glibc/game/g_buildable.o: ./src/game/g_buildable.c src/game/g_local.h
debugi386-glibc/game/g_client.o: ./src/game/g_client.c src/game/g_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/game/bg_public.h \
src/game/g_public.h src/game/g_team.h
+debugi386-glibc/game/g_cmds.o: ./src/game/g_cmds.c src/game/g_local.h src/game/q_shared.h \
+ src/game/surfaceflags.h src/game/bg_public.h src/game/g_public.h \
+ src/game/g_team.h src/game/../../ui/menudef.h
debugi386-glibc/game/g_combat.o: ./src/game/g_combat.c src/game/g_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/game/bg_public.h \
src/game/g_public.h src/game/g_team.h
@@ -163,6 +169,9 @@ qvm/game/g_buildable.asm: ./src/game/g_buildable.c src/game/g_local.h \
qvm/game/g_client.asm: ./src/game/g_client.c src/game/g_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/game/bg_public.h \
src/game/g_public.h src/game/g_team.h
+qvm/game/g_cmds.asm: ./src/game/g_cmds.c src/game/g_local.h src/game/q_shared.h \
+ src/game/surfaceflags.h src/game/bg_public.h src/game/g_public.h \
+ src/game/g_team.h src/game/../../ui/menudef.h
qvm/game/g_combat.asm: ./src/game/g_combat.c src/game/g_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/game/bg_public.h \
src/game/g_public.h src/game/g_team.h
@@ -299,6 +308,10 @@ releasei386-glibc/cgame/cg_scoreboard.o: ./src/cgame/cg_scoreboard.c src/cgame/c
src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
src/cgame/tr_types.h src/cgame/../game/bg_public.h \
src/cgame/cg_public.h
+releasei386-glibc/cgame/cg_servercmds.o: ./src/cgame/cg_servercmds.c src/cgame/cg_local.h \
+ src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
+ src/cgame/tr_types.h src/cgame/../game/bg_public.h \
+ src/cgame/cg_public.h src/cgame/../../ui/menudef.h
releasei386-glibc/cgame/cg_snapshot.o: ./src/cgame/cg_snapshot.c src/cgame/cg_local.h \
src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
src/cgame/tr_types.h src/cgame/../game/bg_public.h \
@@ -403,6 +416,10 @@ debugi386-glibc/cgame/cg_scoreboard.o: ./src/cgame/cg_scoreboard.c src/cgame/cg_
src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
src/cgame/tr_types.h src/cgame/../game/bg_public.h \
src/cgame/cg_public.h
+debugi386-glibc/cgame/cg_servercmds.o: ./src/cgame/cg_servercmds.c src/cgame/cg_local.h \
+ src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
+ src/cgame/tr_types.h src/cgame/../game/bg_public.h \
+ src/cgame/cg_public.h src/cgame/../../ui/menudef.h
debugi386-glibc/cgame/cg_snapshot.o: ./src/cgame/cg_snapshot.c src/cgame/cg_local.h \
src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
src/cgame/tr_types.h src/cgame/../game/bg_public.h \
@@ -507,6 +524,10 @@ qvm/cgame/cg_scoreboard.asm: ./src/cgame/cg_scoreboard.c src/cgame/cg_local.h \
src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
src/cgame/tr_types.h src/cgame/../game/bg_public.h \
src/cgame/cg_public.h
+qvm/cgame/cg_servercmds.asm: ./src/cgame/cg_servercmds.c src/cgame/cg_local.h \
+ src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
+ src/cgame/tr_types.h src/cgame/../game/bg_public.h \
+ src/cgame/cg_public.h src/cgame/../../ui/menudef.h
qvm/cgame/cg_snapshot.asm: ./src/cgame/cg_snapshot.c src/cgame/cg_local.h \
src/cgame/../game/q_shared.h src/cgame/../game/surfaceflags.h \
src/cgame/tr_types.h src/cgame/../game/bg_public.h \
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!
}
generated by cgit (git 2.34.1) at 2024-12-26 16:57:39 +0000