1
0
mirror of https://github.com/td512/re3.git synced 2026-03-03 07:45:02 +00:00

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

# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
This commit is contained in:
Sergeanur
2021-01-23 15:14:15 +02:00
46 changed files with 155 additions and 144 deletions

View File

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