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

# Conflicts:
#	src/core/Radar.cpp

2 files changed, 13 insertions, 0 deletions

diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index d71b0c22..2545b9ab 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -48,6 +48,13 @@ char SaveFileNameJustSaved[260];
 int (&Slots)[SLOT_COUNT+1] = *(int(*)[SLOT_COUNT+1])*(uintptr*)0x72803C;
 CDate &CompileDateAndTime = *(CDate*)0x72BCB8;
 
+
+bool &b_FoundRecentSavedGameWantToLoad = *(bool*)0x95CDA8;
+bool &JustLoadedDontFadeInYet = *(bool*)0x95CDB4;
+bool &StillToFadeOut = *(bool*)0x95CD99;
+uint32 &TimeStartedCountingForFade = *(uint32*)0x9430EC;
+uint32 &TimeToStayFadedBeforeFadeOut = *(uint32*)0x611564;
+
 #define ReadDataFromBufferPointer(buf, to) memcpy(&to, buf, sizeof(to)); buf += align4bytes(sizeof(to));
 #define WriteDataToBufferPointer(buf, from) memcpy(buf, &from, sizeof(from)); buf += align4bytes(sizeof(from));
 
diff --git a/src/save/GenericGameStorage.h b/src/save/GenericGameStorage.h
index e22dfc7e..40d92f16 100644
--- a/src/save/GenericGameStorage.h
+++ b/src/save/GenericGameStorage.h
@@ -32,6 +32,12 @@ extern int &CheckSum;
 extern enum eLevelName &m_LevelToLoad;

 extern int (&Slots)[SLOT_COUNT+1];

 

+extern bool &b_FoundRecentSavedGameWantToLoad;

+extern bool &JustLoadedDontFadeInYet;

+extern bool &StillToFadeOut;

+extern uint32 &TimeStartedCountingForFade;

+extern uint32 &TimeToStayFadedBeforeFadeOut;

+

 extern char SaveFileNameJustSaved[260]; // 8F2570

 

 const char TopLineEmptyFile[] = "THIS FILE IS NOT VALID YET";
\ No newline at end of file