merge master to miami

2021-01-01 14:53:20 +03:00
parent c74c7ce1d4 2f05c64470
commit 9fd93e8e57
18 changed files with 1173 additions and 88 deletions
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -803,8 +803,14 @@ CCredits::Render(void)
 	if(TheCamera.m_WideScreenOn)
 		TheCamera.DrawBordersForWideScreen();

+#ifdef FIX_BUGS
 	if(lineoffset + DEFAULT_SCREEN_HEIGHT - scrolloffset < -10.0f)
+#else
+	if(lineoffset + SCREEN_HEIGHT - scrolloffset < -10.0f)
+#endif
+	{
 		bCreditsGoing = false;
+	}
 }

 bool CCredits::AreCreditsDone(void)