diff options
| author | Tim Angus <tim@ngus.net> | 2001-09-19 22:44:11 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-09-19 22:44:11 +0000 |
| commit | 5c6c20cfb07fb6f223daf4679bf20d2e11c76a37 (patch) | |
| tree | 2beda8782208ff80da64f5920fc53d389ffacb86 /src/ui | |
| parent | 93b163274c3726e87aab10b8494d5a910efe45db (diff) | |
More integration of TA UI stuff
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_atoms.c | 2 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 1 | ||||
| -rw-r--r-- | src/ui/ui_shared.c | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c index cac94738..6a6ddda6 100644 --- a/src/ui/ui_atoms.c +++ b/src/ui/ui_atoms.c @@ -356,7 +356,7 @@ qboolean UI_ConsoleCommand( int realTime ) if ( Q_stricmp (cmd, "menu") == 0 ) { - strcpy( arg1, UI_Argv( 1 ) ); + arg1 = UI_Argv( 1 ); if( Menu_Count() > 0 ) { diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 0d545dfc..35d8f67e 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -5219,6 +5219,7 @@ void UI_LoadNonIngame() { void _UI_SetActiveMenu( uiMenuCommand_t menu ) { char buf[256]; + Com_Printf( "_UI_SetActiveMenu\n" ); // this should be the ONLY way the menu system is brought up // enusure minumum menu data is cached if (Menu_Count() > 0) { diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c index 3240ebb8..67824064 100644 --- a/src/ui/ui_shared.c +++ b/src/ui/ui_shared.c @@ -4105,6 +4105,7 @@ menuDef_t *Menus_ActivateByName(const char *p) { int i; menuDef_t *m = NULL; menuDef_t *focus = Menu_GetFocused(); + for (i = 0; i < menuCount; i++) { if (Q_stricmp(Menus[i].window.name, p) == 0) { m = &Menus[i]; @@ -5568,8 +5569,6 @@ Menu_New void Menu_New(int handle) { menuDef_t *menu = &Menus[menuCount]; - Com_Printf( "menu_new\n" ); - if (menuCount < MAX_MENUS) { Menu_Init(menu); if (Menu_Parse(handle, menu)) { |