FF7: Fix wrong rendering for timer boxes when using normal window mode

tangtang95 · Aug 17, 2024 · 0cbe95c · 0cbe95c
1 parent b5f45ca
commit 0cbe95c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -13,6 +13,7 @@
 
 ## FF7
 - Rendering: Fix wrong rendering for fonts in Field mode while scrolling.
+- Rendering: Fix wrong rendering for timer boxes when using normal window mode.
 - Widescreen: Added option to clip camera position during scripted events ( https://github.com/julianxhokaxhiu/FFNx/pull/706 )
 - Widescreen: Added feature to extend movies in true widescreen mode ( https://github.com/julianxhokaxhiu/FFNx/pull/700 )
 - 60FPS: Fix bug that displayed battle text too quickly when set at full SLOW speed

diff --git a/src/gl/special_case.cpp b/src/gl/special_case.cpp
@@ -119,6 +119,13 @@ uint32_t gl_special_case(uint32_t primitivetype, uint32_t vertextype, struct nve
 		{
 			// always z-sort vanilla messages
 			if(SAFE_GFXOBJ_CHECK(graphics_object, ff7_externals.menu_objects->window_bg)) force_defer = true;
+
+			// fix timer messages when window is normal
+			if(SAFE_GFXOBJ_CHECK(graphics_object, ff7_externals.menu_objects->_btl_win)) force_defer = true;
+			if(SAFE_GFXOBJ_CHECK(graphics_object, ff7_externals.menu_objects->btl_win_a)) force_defer = true;
+			if(SAFE_GFXOBJ_CHECK(graphics_object, ff7_externals.menu_objects->btl_win_b)) force_defer = true;
+			if(SAFE_GFXOBJ_CHECK(graphics_object, ff7_externals.menu_objects->btl_win_c)) force_defer = true;
+			if(SAFE_GFXOBJ_CHECK(graphics_object, ff7_externals.menu_objects->btl_win_d)) force_defer = true;
 		}
 
 		if(mode == MODE_BATTLE)