From fa401cd1d87563ab8b630faa4cdfc2e78cc6b6be Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 26 Apr 2015 20:15:52 +0000 Subject: [PATCH] Convert PAGE_IN_GAUGE to ternary operator --- similar/main/gauges.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/similar/main/gauges.cpp b/similar/main/gauges.cpp index ca739884e..37f3c120e 100644 --- a/similar/main/gauges.cpp +++ b/similar/main/gauges.cpp @@ -348,18 +348,18 @@ array Gauges, // Array of all gauge bitmaps. Gauges_hires; // hires gauges static array weapon_box_user{{WBU_WEAPON, WBU_WEAPON}}; //see WBU_ constants in gauges.h #endif -grs_bitmap deccpt; +static grs_bitmap deccpt; static array WinBoxOverlay; // Overlay subbitmaps for both weapon boxes #define PAGE_IN_GAUGE(x) _page_in_gauge(x) static inline void _page_in_gauge(int x) { + const auto &g = #if defined(DXX_BUILD_DESCENT_II) - if (HIRESMODE) - PIGGY_PAGE_IN(Gauges_hires[x]); - else + HIRESMODE ? Gauges_hires : #endif - PIGGY_PAGE_IN(Gauges[x]); + Gauges; + PIGGY_PAGE_IN(g[x]); } static void draw_ammo_info(int x,int y,int ammo_count);