Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/core/re3.cpp
This commit is contained in:
Sergeanur 2021-01-23 17:54:46 +02:00
commit e9689a0a07
16 changed files with 561 additions and 189 deletions

View file

@ -345,7 +345,11 @@ GenericLoad()
#endif
ReadDataFromBufferPointer(buf, CGame::currArea);
ReadDataFromBufferPointer(buf, CVehicle::bAllTaxisHaveNitro);
#ifdef LOAD_INI_SETTINGS
buf += align4bytes(sizeof(CPad::bInvertLook4Pad));
#else
ReadDataFromBufferPointer(buf, CPad::bInvertLook4Pad);
#endif
ReadDataFromBufferPointer(buf, CTimeCycle::m_ExtraColour);
ReadDataFromBufferPointer(buf, CTimeCycle::m_bExtraColourOn);
ReadDataFromBufferPointer(buf, CTimeCycle::m_ExtraColourInter);