diff --git a/src/common/menu/menu.cpp b/src/common/menu/menu.cpp index 6431b805db..e1c543e02f 100644 --- a/src/common/menu/menu.cpp +++ b/src/common/menu/menu.cpp @@ -458,7 +458,6 @@ void M_DoStartControlPanel (bool scaleoverride) delete CurrentScaleOverrider; CurrentScaleOverrider = nullptr; } - } //============================================================================= diff --git a/wadsrc/static/zscript/ui/menu/listmenu.zs b/wadsrc/static/zscript/ui/menu/listmenu.zs index 917fe270c4..c102565183 100644 --- a/wadsrc/static/zscript/ui/menu/listmenu.zs +++ b/wadsrc/static/zscript/ui/menu/listmenu.zs @@ -21,6 +21,7 @@ class ListMenuDescriptor : MenuDescriptor native native int mFontColor; native int mFontColor2; native bool mCenter; + native bool mAnimatedTransition; native int mVirtWidth, mVirtHeight; native void Reset(); @@ -51,6 +52,7 @@ class ListMenu : Menu { Super.Init(parent); mDesc = desc; + AnimatedTransition = mDesc.mAnimatedTransition; if (desc.mCenter) { double center = 160; diff --git a/wadsrc/static/zscript/ui/menu/menu.zs b/wadsrc/static/zscript/ui/menu/menu.zs index 10b7adb583..7c08a1f454 100644 --- a/wadsrc/static/zscript/ui/menu/menu.zs +++ b/wadsrc/static/zscript/ui/menu/menu.zs @@ -94,6 +94,7 @@ class Menu : Object native ui version("2.4") native bool mBackbuttonSelected; native bool DontDim; native bool DontBlur; + native bool AnimatedTransition; native static int MenuTime(); native static Menu GetCurrentMenu(); @@ -116,6 +117,7 @@ class Menu : Object native ui version("2.4") mBackbuttonSelected = false; DontDim = false; DontBlur = false; + AnimatedTransition = false; } //============================================================================= @@ -241,11 +243,11 @@ class Menu : Object native ui version("2.4") int y = (!(m_show_backbutton&2))? 0:screen.GetHeight() - h; if (mBackbuttonSelected && (mMouseCapture || m_use_mouse == 1)) { - screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_ColorOverlay, Color(40, 255,255,255)); + screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_ColorOverlay, Color(40, 255,255,255), DTA_NOOFFSET, true); } else { - screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_Alpha, BackbuttonAlpha); + screen.DrawTexture(tex, true, x, y, DTA_CleanNoMove, true, DTA_Alpha, BackbuttonAlpha, DTA_NOOFFSET, true); } } } diff --git a/wadsrc/static/zscript/ui/menu/menucustomize.zs b/wadsrc/static/zscript/ui/menu/menucustomize.zs index 35d330d6a0..3d3ee14311 100644 --- a/wadsrc/static/zscript/ui/menu/menucustomize.zs +++ b/wadsrc/static/zscript/ui/menu/menucustomize.zs @@ -1,6 +1,6 @@ // This class allows global customization of certain menu aspects, e.g. replacing the menu caption. -class MenuDelegateBase +class MenuDelegateBase ui { virtual int DrawCaption(String title, Font fnt, int y, bool drawit) {