archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-26 20:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Fire-Head/master'

Browse Source 
# Conflicts:
#	src/core/Radar.cpp
This commit is contained in:
Sergeanur
2020-04-09 21:40:46 +03:00
parent 5b5de5d2f3 590ff32469
commit a5239b554f
20 changed files with 1726 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/render/Hud.cpp
View File

@ -815,7 +815,7 @@ void CHud::Draw()
DrawScriptText
*/
if (!CTimer::GetIsUserPaused()) {
CTextLine* IntroText = CTheScripts::IntroTextLines;
intro_text_line* IntroText = CTheScripts::IntroTextLines;
for (int i = 0; i < MAX_NUM_INTRO_TEXT_LINES; i++) {
if (CTheScripts::IntroTextLines[i].m_Text[0] && CTheScripts::IntroTextLines[i].m_bTextBeforeFade) {
@ -862,7 +862,7 @@ void CHud::Draw()
}
}
CScriptRectangle* IntroRect = CTheScripts::IntroRectangles;
intro_script_rectangle* IntroRect = CTheScripts::IntroRectangles;
for (int i = 0; i < 16; i++) {
if (CTheScripts::IntroRectangles[i].m_bIsUsed && CTheScripts::IntroRectangles[i].m_bBeforeFade) {