From 4c883f81b6a2ea614c3327ce4888cb9b13bc362e Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 15 Jan 2015 06:45:24 +0000 Subject: [PATCH] MSVC build fix... guess it was upset about the macro expansion git-svn-id: https://svn.eduke32.com/eduke32@4921 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/menus.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index e54ad13f6..63c08fc85 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -1864,17 +1864,19 @@ static void M_PreMenuDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin) #ifndef DROIDMENU mgametextcenter(origin.x, origin.y + (112<<16), "Please visit Steam and purchase\n" "Duke Nukem 3D: Megaton Edition\n" + "to upgrade to the full registered\n" + "version of Duke Nukem 3D."); #else # if defined __APPLE__ && TARGET_OS_IPHONE mgametextcenter(origin.x, origin.y + (121<<16), "Please visit the App Store\n" -# else - mgametextcenter(origin.x, origin.y + (121<<16), "Please visit the Play Store\n" -# endif -#endif - "to upgrade to the full registered\n" "version of Duke Nukem 3D."); - +# else + mgametextcenter(origin.x, origin.y + (121<<16), "Please visit the Play Store\n" + "to upgrade to the full registered\n" + "version of Duke Nukem 3D."); +# endif +#endif mgametextcenter(origin.x, origin.y + ((148+16)<<16), "Press any key or button..."); break; @@ -4131,7 +4133,11 @@ static void M_RunMenu_MouseReturn(Menu_t *cm, const vec2_t origin) if (cm->menuID == MENU_MAIN) return; - rotatesprite_(origin.x + (tilesiz[SELECTDIR].y<<16), origin.y, 65536, 512, SELECTDIR, M_RunMenuInput_MouseReturn_status ? 4-(sintable[(totalclock<<4)&2047]>>11) : 6, 0, 2|8|16|RS_ALIGN_L, 0, 0, xdim_from_320_16(origin.x + x_widescreen_left()), 0, xdim_from_320_16(origin.x + x_widescreen_left() + (tilesiz[SELECTDIR].y<<15)), ydim-1);; + rotatesprite_(origin.x + (tilesiz[SELECTDIR].y << 16), origin.y, 65536, 512, SELECTDIR, + M_RunMenuInput_MouseReturn_status ? 4 - (sintable[(totalclock << 4) & 2047] >> 11) : 6, 0, + 2 | 8 | 16 | RS_ALIGN_L, MOUSEALPHA, 0, xdim_from_320_16(origin.x + x_widescreen_left()), 0, + xdim_from_320_16(origin.x + x_widescreen_left() + (tilesiz[SELECTDIR].y << 15)), ydim - 1); + ; } #endif