Remove most of ‘#if USE_UI’ tests.

7 files changed, 41 insertions, 87 deletions

diff --git a/inc/client/ui.h b/inc/client/ui.h
index ae3975f..a446073 100644
--- a/inc/client/ui.h
+++ b/inc/client/ui.h
@@ -31,7 +31,8 @@ typedef enum {
     UIMENU_GAME
 } uiMenu_t;
 
-qboolean    UI_Init(void);
+#if USE_UI
+void        UI_Init(void);
 void        UI_Shutdown(void);
 void        UI_ModeChanged(void);
 void        UI_Keydown(int key);
@@ -43,5 +44,19 @@ void        UI_StatusEvent(const serverStatus_t *status);
 void        UI_ErrorEvent(netadr_t *from);
 void        UI_MouseEvent(int x, int y);
 qboolean    UI_IsTransparent(void);
+#else
+#define     UI_Init()               (void)0
+#define     UI_Shutdown()           (void)0
+#define     UI_ModeChanged()        (void)0
+#define     UI_Keydown(key)         (void)0
+#define     UI_CharEvent(key)       (void)0
+#define     UI_Draw(realtime)       (void)0
+#define     UI_OpenMenu(menu)       (void)0
+#define     UI_Frame(msec)          (void)0
+#define     UI_StatusEvent(status)  (void)0
+#define     UI_ErrorEvent(from)     (void)0
+#define     UI_MouseEvent(x, y)     (void)0
+#define     UI_IsTransparent()      qtrue
+#endif
 
 #endif // UI_H
diff --git a/src/client/input.c b/src/client/input.c
index 5281815..57cdf16 100644
--- a/src/client/input.c
+++ b/src/client/input.c
@@ -221,9 +221,7 @@ void IN_MouseEvent(int x, int y)
     if (input.hide_cursor == HIDE_SHOW_NC)
         input.hide_cursor = HIDE_SHOW;
 
-#if USE_UI
     UI_MouseEvent(x, y);
-#endif
 }
 
 /*
diff --git a/src/client/keys.c b/src/client/keys.c
index 3fd2ead..b67aa21 100644
--- a/src/client/keys.c
+++ b/src/client/keys.c
@@ -700,14 +700,11 @@ void Key_Event(unsigned key, qboolean down, unsigned time)
         if (cls.key_dest == KEY_GAME &&
             cl.frame.ps.stats[STAT_LAYOUTS] &&
             cls.demo.playback == qfalse) {
-#if USE_UI
-            // force main menu if escape is held
             if (key_repeats[key] == 2) {
+                // force main menu if escape is held
                 UI_OpenMenu(UIMENU_GAME);
-            } else
-#endif
-            // put away help computer / inventory
-            if (key_repeats[key] == 1) {
+            } else if (key_repeats[key] == 1) {
+                // put away help computer / inventory
                 CL_ClientCommand("putaway");
             }
             return;
@@ -719,28 +716,19 @@ void Key_Event(unsigned key, qboolean down, unsigned time)
 
         if (cls.key_dest & KEY_CONSOLE) {
             if (cls.state < ca_active && !(cls.key_dest & KEY_MENU)) {
-#if USE_UI
                 UI_OpenMenu(UIMENU_MAIN);
-#endif
             } else {
                 Con_Close(qtrue);
             }
-        }
-#if USE_UI
-        else if (cls.key_dest & KEY_MENU) {
+        } else if (cls.key_dest & KEY_MENU) {
             UI_Keydown(key);
-        }
-#endif
-        else if (cls.key_dest & KEY_MESSAGE) {
+        } else if (cls.key_dest & KEY_MESSAGE) {
             Key_Message(key);
-        }
-#if USE_UI
-        else if (cls.state == ca_active) {
+        } else if (cls.state == ca_active) {
             UI_OpenMenu(UIMENU_GAME);
         } else {
             UI_OpenMenu(UIMENU_MAIN);
         }
-#endif
         return;
     }
 
@@ -821,13 +809,9 @@ void Key_Event(unsigned key, qboolean down, unsigned time)
 
     if (cls.key_dest & KEY_CONSOLE) {
         Key_Console(key);
-    }
-#if USE_UI
-    else if (cls.key_dest & KEY_MENU) {
+    } else if (cls.key_dest & KEY_MENU) {
         UI_Keydown(key);
-    }
-#endif
-    else if (cls.key_dest & KEY_MESSAGE) {
+    } else if (cls.key_dest & KEY_MESSAGE) {
         Key_Message(key);
     }
 
@@ -896,13 +880,9 @@ void Key_Event(unsigned key, qboolean down, unsigned time)
 
     if (cls.key_dest & KEY_CONSOLE) {
         Char_Console(key);
-    }
-#if USE_UI
-    else if (cls.key_dest & KEY_MENU) {
+    } else if (cls.key_dest & KEY_MENU) {
         UI_CharEvent(key);
-    }
-#endif
-    else if (cls.key_dest & KEY_MESSAGE) {
+    } else if (cls.key_dest & KEY_MESSAGE) {
         Char_Message(key);
     }
 
@@ -925,13 +905,9 @@ void Key_CharEvent(int key)
 
     if (cls.key_dest & KEY_CONSOLE) {
         Char_Console(key);
-    }
-#if USE_UI
-    else if (cls.key_dest & KEY_MENU) {
+    } else if (cls.key_dest & KEY_MENU) {
         UI_CharEvent(key);
-    }
-#endif
-    else if (cls.key_dest & KEY_MESSAGE) {
+    } else if (cls.key_dest & KEY_MESSAGE) {
         Char_Message(key);
     }
 }
diff --git a/src/client/main.c b/src/client/main.c
index bc53747..8f9f903 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -382,9 +382,7 @@ void CL_CheckForResend(void)
         cls.passive = qfalse;
 
         Con_Popup();
-#if USE_UI
         UI_OpenMenu(UIMENU_NONE);
-#endif
     }
 
     // resend if we haven't gotten a reply yet
@@ -751,13 +749,11 @@ void CL_Disconnect(error_type_t type)
     cls.state = ca_disconnected;
     cls.userinfo_modified = 0;
 
-#if USE_UI
     if (type == ERR_DISCONNECT) {
         UI_OpenMenu(UIMENU_DEFAULT);
     } else {
         UI_OpenMenu(UIMENU_NONE);
     }
-#endif
 
     CL_CheckForPause();
 
@@ -2291,9 +2287,7 @@ void CL_RestartFilesystem(qboolean total)
         cls.state = ca_loading;
     }
 
-#if USE_UI
     UI_Shutdown();
-#endif
 
     S_StopAllSounds();
     S_FreeAllSounds();
@@ -2307,25 +2301,20 @@ void CL_RestartFilesystem(qboolean total)
 
         SCR_RegisterMedia();
         Con_RegisterMedia();
-#if USE_UI
         UI_Init();
-#endif
     } else {
         FS_Restart(total);
     }
 
-#if USE_UI
     if (cls_state == ca_disconnected) {
         UI_OpenMenu(UIMENU_DEFAULT);
-    } else
-#endif
-        if (cls_state >= ca_loading) {
-            CL_LoadState(LOAD_MAP);
-            CL_PrepRefresh();
-            CL_LoadState(LOAD_SOUNDS);
-            CL_RegisterSounds();
-            CL_LoadState(LOAD_FINISH);
-        }
+    } else if (cls_state >= ca_loading) {
+        CL_LoadState(LOAD_MAP);
+        CL_PrepRefresh();
+        CL_LoadState(LOAD_SOUNDS);
+        CL_RegisterSounds();
+        CL_LoadState(LOAD_FINISH);
+    }
 
     // switch back to original state
     cls.state = cls_state;
@@ -2357,28 +2346,21 @@ void CL_RestartRefresh(qboolean total)
         CL_InitRefresh();
         IN_Init();
     } else {
-#if USE_UI
         UI_Shutdown();
-#endif
         R_Shutdown(qfalse);
         R_Init(qfalse);
         SCR_RegisterMedia();
         Con_RegisterMedia();
-#if USE_UI
         UI_Init();
-#endif
     }
 
-#if USE_UI
     if (cls_state == ca_disconnected) {
         UI_OpenMenu(UIMENU_DEFAULT);
-    } else
-#endif
-        if (cls_state >= ca_loading) {
-            CL_LoadState(LOAD_MAP);
-            CL_PrepRefresh();
-            CL_LoadState(LOAD_FINISH);
-        }
+    } else if (cls_state >= ca_loading) {
+        CL_LoadState(LOAD_MAP);
+        CL_PrepRefresh();
+        CL_LoadState(LOAD_FINISH);
+    }
 
     // switch back to original state
     cls.state = cls_state;
@@ -3161,9 +3143,7 @@ unsigned CL_Frame(unsigned msec)
 
     Con_RunConsole();
 
-#if USE_UI
     UI_Frame(main_extra);
-#endif
 
     if (ref_frame) {
         // update the screen
@@ -3281,9 +3261,7 @@ void CL_Init(void)
     HTTP_Init();
 #endif
 
-#if USE_UI
     UI_OpenMenu(UIMENU_DEFAULT);
-#endif
 
     Con_PostInit();
     Con_RunConsole();
diff --git a/src/client/refresh.c b/src/client/refresh.c
index 51a29ee..4312366 100644
--- a/src/client/refresh.c
+++ b/src/client/refresh.c
@@ -313,9 +313,7 @@ void CL_InitRefresh(void)
     // Initialize the rest of graphics subsystems
     V_Init();
     SCR_Init();
-#if USE_UI
     UI_Init();
-#endif
 
     SCR_RegisterMedia();
     Con_RegisterMedia();
@@ -337,9 +335,7 @@ void CL_ShutdownRefresh(void)
     // Shutdown the rest of graphics subsystems
     V_Shutdown();
     SCR_Shutdown();
-#if USE_UI
     UI_Shutdown();
-#endif
 
     vid_geometry->changed = NULL;
     vid_fullscreen->changed = NULL;
diff --git a/src/client/screen.c b/src/client/screen.c
index f0ad927..a4af52f 100644
--- a/src/client/screen.c
+++ b/src/client/screen.c
@@ -1127,9 +1127,7 @@ void SCR_SetCrosshairColor(void)
 void SCR_ModeChanged(void)
 {
     IN_Activate();
-#if USE_UI
     UI_ModeChanged();
-#endif
     // video sync flag may have changed
     CL_UpdateFrameTimes();
     cls.disable_screen = 0;
@@ -1916,7 +1914,6 @@ void SCR_UpdateScreen(void)
 
     R_BeginFrame();
 
-#if USE_UI
     if (UI_IsTransparent()) {
         // do 3D refresh drawing
         draw_active_frame();
@@ -1924,10 +1921,6 @@ void SCR_UpdateScreen(void)
 
     // draw main menu
     UI_Draw(cls.realtime);
-#else
-    // do 3D refresh drawing
-    draw_active_frame();
-#endif
 
     // draw console
     Con_DrawConsole();
diff --git a/src/client/ui/ui.c b/src/client/ui/ui.c
index b795509..ded9b28 100644
--- a/src/client/ui/ui.c
+++ b/src/client/ui/ui.c
@@ -634,7 +634,7 @@ static void UI_FreeMenus(void)
 UI_Init
 =================
 */
-qboolean UI_Init(void)
+void UI_Init(void)
 {
     char buffer[MAX_QPATH];
     int i;
@@ -674,8 +674,6 @@ qboolean UI_Init(void)
     Com_DPrintf("Registered %d menus.\n", List_Count(&ui_menus));
 
     uis.initialized = qtrue;
-
-    return qtrue;
 }
 
 /*