From f19c6644a80f8af5c66b8c19eb81a465e4573893 Mon Sep 17 00:00:00 2001
From: Paweł Redman <pawel.redman@gmail.com>
Date: Sat, 5 Dec 2015 18:46:16 +0100
Subject: Fix ui's ABI.

---
 src/ui/ui_main.c   | 10 ++++++++++
 src/ui/ui_public.h | 14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 0278cca..424513f 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -1366,6 +1366,8 @@ void UI_ParseMenu( const char *menuFile )
 
   handle = trap_Parse_LoadSource( menuFile );
 
+  Com_Printf("^5ui: UI_ParseMenu(%s)\n", menuFile);
+
   if( !handle )
   {
     Com_Printf( S_COLOR_YELLOW "WARNING: Menu file %s not found\n",
@@ -1380,6 +1382,8 @@ void UI_ParseMenu( const char *menuFile )
     if( !trap_Parse_ReadToken( handle, &token ) )
       break;
 
+    Com_Printf("^5--- token.string = %s\n", token.string);
+
     //if( Q_stricmp( token, "{" ) ) {
     //  Com_Printf( "Missing { in menu file\n" );
     //  break;
@@ -1395,6 +1399,7 @@ void UI_ParseMenu( const char *menuFile )
 
     if( Q_stricmp( token.string, "assetGlobalDef" ) == 0 )
     {
+      Com_Printf("^5--- assetGlobalDef\n");
       if( Asset_Parse( handle ) )
         continue;
       else
@@ -1403,6 +1408,7 @@ void UI_ParseMenu( const char *menuFile )
 
     if( Q_stricmp( token.string, "menudef" ) == 0 )
     {
+      Com_Printf("^5--- Menu_New\n");
       // start a new menu
       Menu_New( handle );
     }
@@ -4211,6 +4217,10 @@ void UI_SetActiveMenu( uiMenuCommand_t menu )
   // this should be the ONLY way the menu system is brought up
   // enusure minumum menu data is cached
 
+  Com_Printf("^5ui: UI_SetActiveMenu(%i)\n", menu);
+  Com_Printf("^5--: Menu_Count() = %i\n", Menu_Count());
+  
+
 
   if( Menu_Count() > 0 )
   {
diff --git a/src/ui/ui_public.h b/src/ui/ui_public.h
index f6db76d..a70746b 100644
--- a/src/ui/ui_public.h
+++ b/src/ui/ui_public.h
@@ -171,12 +171,6 @@ typedef enum
   UI_MOUSE_EVENT,
   //  void  UI_MouseEvent( int dx, int dy );
 
-  UI_MOUSE_POSITION,
-  //  int   UI_MousePosition( void );
-
-  UI_SET_MOUSE_POSITION,
-  //  void  UI_SetMousePosition( int x, int y );
-
   UI_REFRESH,
   //  void  UI_Refresh( int time );
 
@@ -189,12 +183,18 @@ typedef enum
   UI_CONSOLE_COMMAND,
   //  qboolean UI_ConsoleCommand( int realTime );
 
-  UI_DRAW_CONNECT_SCREEN
+  UI_DRAW_CONNECT_SCREEN,
   //  void  UI_DrawConnectScreen( qboolean overlay );
 
   // if !overlay, the background will be drawn, otherwise it will be
   // overlayed over whatever the cgame has drawn.
   // a GetClientState syscall will be made to get the current strings
+
+  UI_MOUSE_POSITION,
+  //  int   UI_MousePosition( void );
+
+  UI_SET_MOUSE_POSITION
+  //  void  UI_SetMousePosition( int x, int y );
 }
 uiExport_t;
 
-- 
cgit