From fb301ddae7c2d30bbab3416bc16675c68061521f Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 9 Jun 2018 20:36:42 +0000 Subject: [PATCH] Rename KXDWN macro and GAMEFLAG_KXDWN to IONMAIDEN and GAMEFLAG_IONMAIDEN git-svn-id: https://svn.eduke32.com/eduke32@6913 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/common_game.h | 5 +++-- source/duke3d/src/menus.cpp | 30 +++++++++++++++--------------- source/duke3d/src/screens.cpp | 10 +++++----- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/source/duke3d/src/common_game.h b/source/duke3d/src/common_game.h index 0ac5f97ce..61aaabac8 100644 --- a/source/duke3d/src/common_game.h +++ b/source/duke3d/src/common_game.h @@ -30,7 +30,8 @@ extern int g_useCwd; #define GAMEFLAG_ADDON 0x00000010 #define GAMEFLAG_SHAREWARE 0x00000020 #define GAMEFLAG_DUKEBETA 0x00000060 // includes 0x20 since it's a shareware beta -#define GAMEFLAG_KXDWN 0x00000080 +#define GAMEFLAG_IONMAIDEN 0x00000080 +#define GAMEFLAG_STANDALONE 0x00000100 #define GAMEFLAGMASK 0x000000FF // flags allowed from grpinfo extern struct grpfile_t const *g_selectedGrp; @@ -45,7 +46,7 @@ extern int g_addonNum; #define NAM_WW2GI (g_gameType & (GAMEFLAG_NAM|GAMEFLAG_WW2GI)) #define SHAREWARE (g_gameType & GAMEFLAG_SHAREWARE) #define DUKEBETA ((g_gameType & GAMEFLAG_DUKEBETA) == GAMEFLAG_DUKEBETA) -#define KXDWN (g_gameType & GAMEFLAG_KXDWN) +#define IONMAIDEN (g_gameType & GAMEFLAG_IONMAIDEN) enum Games_t { GAME_DUKE = 0, diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index ff7f16444..5cf29548f 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -148,12 +148,12 @@ static void Menu_DrawCursorCommon(int32_t x, int32_t y, int32_t z, int32_t picnu } static void Menu_DrawCursorLeft(int32_t x, int32_t y, int32_t z) { - if (KXDWN) return; + if (IONMAIDEN) return; Menu_DrawCursorCommon(x, y, z, VM_OnEventWithReturn(EVENT_MENUCURSORLEFT, -1, myconnectindex, SPINNINGNUKEICON+((totalclock>>3)%7))); } static void Menu_DrawCursorRight(int32_t x, int32_t y, int32_t z) { - if (KXDWN) return; + if (IONMAIDEN) return; Menu_DrawCursorCommon(x, y, z, VM_OnEventWithReturn(EVENT_MENUCURSORRIGHT, -1, myconnectindex, SPINNINGNUKEICON+6-((6+(totalclock>>3))%7))); } static void Menu_DrawCursorTextTile(int32_t x, int32_t y, int32_t h, int32_t picnum, vec2s_t const & siz, int32_t ydim_upper = 0, int32_t ydim_lower = ydim-1) @@ -165,7 +165,7 @@ static void Menu_DrawCursorText(int32_t x, int32_t y, int32_t h, int32_t ydim_up { vec2s_t const & siz = tilesiz[SPINNINGNUKEICON]; - if (KXDWN || siz.x == 0) + if (IONMAIDEN || siz.x == 0) { Menu_DrawCursorTextTile(x, y, h, SMALLFNTCURSOR, tilesiz[SMALLFNTCURSOR], ydim_upper, ydim_lower); return; @@ -1828,7 +1828,7 @@ void Menu_Init(void) ME_SOUND_DUKETALK.name = "Grunt talk:"; #endif - if (KXDWN) + if (IONMAIDEN) { MF_Redfont.between.x = 2<<16; MF_Redfont.cursorScale = 32768; @@ -2135,7 +2135,7 @@ static void Menu_PreDrawBackground(MenuID_t cm, const vec2_t origin) case MENU_LOAD: case MENU_SAVE: - if (KXDWN) + if (IONMAIDEN) break; fallthrough__; case MENU_CREDITS4: @@ -3860,7 +3860,7 @@ int32_t Menu_Anim_SinInLeft(MenuAnimation_t *animdata) void Menu_AnimateChange(int32_t cm, MenuAnimationType_t animtype) { - if (KXDWN) + if (IONMAIDEN) { m_animation.start = 0; m_animation.length = 0; @@ -3988,17 +3988,17 @@ static void Menu_AboutToStartDisplaying(Menu_t * m) switch (m->menuID) { case MENU_MAIN: - if (KXDWN) + if (IONMAIDEN) ME_MAIN_LOADGAME.name = s_Continue; break; case MENU_MAIN_INGAME: - if (KXDWN) + if (IONMAIDEN) ME_MAIN_LOADGAME.name = s_LoadGame; break; case MENU_LOAD: - if (KXDWN) + if (IONMAIDEN) M_LOAD.title = (g_player[myconnectindex].ps->gm & MODE_GAME) ? s_LoadGame : s_Continue; Menu_LoadReadHeaders(); @@ -4164,7 +4164,7 @@ int Menu_Change(MenuID_t cm) else return 1; - if (KXDWN) + if (IONMAIDEN) { Menu_t * parent = m_currentMenu, * result = NULL; @@ -4398,7 +4398,7 @@ static void Menu_GetFmt(const MenuFont_t *font, uint8_t const status, int32_t *s if (status & MT_Disabled) s += font->shade_disabled; - if (KXDWN && status & MT_Selected) + if (IONMAIDEN && status & MT_Selected) *z += (*z >> 4); } @@ -6827,7 +6827,7 @@ void M_DisplayMenus(void) // need EVENT_DISPLAYMENUBACKGROUND here - if (!KXDWN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && backgroundOK) + if (!IONMAIDEN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && backgroundOK) videoFadeToBlack(1); if (Menu_UpdateScreenOK(g_currentMenu)) @@ -6874,7 +6874,7 @@ void M_DisplayMenus(void) } // hack; need EVENT_DISPLAYMENUBACKGROUND above - if (KXDWN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2 || m_parentMenu != NULL) && backgroundOK) + if (IONMAIDEN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2 || m_parentMenu != NULL) && backgroundOK) videoFadeToBlack(1); // Display the menu, with a transition animation if applicable. @@ -6962,7 +6962,7 @@ void M_DisplayMenus(void) auto const oyxaspect = yxaspect; int32_t alpha; - if (KXDWN) + if (IONMAIDEN) { renderSetAspect(viewingrange, 65536); cursorpos.x = scale(cursorpos.x - (320<<15), ydim << 2, xdim * 3) + (320<<15); @@ -6979,7 +6979,7 @@ void M_DisplayMenus(void) rotatesprite_fs_alpha(cursorpos.x, cursorpos.y, z, 0, a, 0, p, o, alpha); - if (KXDWN) + if (IONMAIDEN) renderSetAspect(viewingrange, oyxaspect); } } diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp index b4e63379c..fd27c1929 100644 --- a/source/duke3d/src/screens.cpp +++ b/source/duke3d/src/screens.cpp @@ -131,7 +131,7 @@ void G_GetCrosshairColor(void) void G_SetCrosshairColor(int32_t r, int32_t g, int32_t b) { - if (KXDWN) + if (IONMAIDEN) return; int32_t i, ii; @@ -1187,7 +1187,7 @@ void G_DisplayRest(int32_t smoothratio) uint32_t crosshair_scale = divscale16(ud.crosshairscale, 100); auto const oyxaspect = yxaspect; - if (KXDWN) + if (IONMAIDEN) { crosshairpos.x = scale(crosshairpos.x - (320<<15), ydim << 2, xdim * 3) + (320<<15); crosshairpos.y = scale(crosshairpos.y - (200<<15), (ydim << 2) * 6, (xdim * 3) * 5) + (200<<15); @@ -1199,7 +1199,7 @@ void G_DisplayRest(int32_t smoothratio) rotatesprite_win(crosshairpos.x, crosshairpos.y, crosshair_scale, 0, a, 0, crosshair_pal, crosshair_o); - if (KXDWN) + if (IONMAIDEN) renderSetAspect(viewingrange, oyxaspect); } } @@ -1218,7 +1218,7 @@ void G_DisplayRest(int32_t smoothratio) uint32_t pointer_scale = 65536; auto const oyxaspect = yxaspect; - if (KXDWN) + if (IONMAIDEN) { pointerpos.x = scale(pointerpos.x - (320<<15), ydim << 2, xdim * 3) + (320<<15); pointerpos.y = scale(pointerpos.y - (200<<15), (ydim << 2) * 6, (xdim * 3) * 5) + (200<<15); @@ -1230,7 +1230,7 @@ void G_DisplayRest(int32_t smoothratio) rotatesprite_win(pointerpos.x, pointerpos.y, pointer_scale, 0, a, 0, pointer_pal, pointer_o); - if (KXDWN) + if (IONMAIDEN) renderSetAspect(viewingrange, oyxaspect); } }