diff --git a/TombEngine/Game/Setup.cpp b/TombEngine/Game/Setup.cpp index 076acc185..42bfb08df 100644 --- a/TombEngine/Game/Setup.cpp +++ b/TombEngine/Game/Setup.cpp @@ -174,6 +174,7 @@ void InitializeGameFlags() FlipEffect = NO_VALUE; FlipStatus = false; + NumRPickups = 0; Camera.underwater = false; } @@ -252,7 +253,6 @@ void InitializeObjects() // User defined objects CustomObjects(); - NumRPickups = 0; CurrentSequence = 0; SequenceResults[0][1][2] = 0; SequenceResults[0][2][1] = 1; diff --git a/TombEngine/Specific/level.cpp b/TombEngine/Specific/level.cpp index aa42a4e55..3addd27f9 100644 --- a/TombEngine/Specific/level.cpp +++ b/TombEngine/Specific/level.cpp @@ -219,8 +219,6 @@ std::string ReadString() void LoadItems() { - InitializeObjects(); - g_Level.NumItems = ReadCount(); TENLog("Moveables: " + std::to_string(g_Level.NumItems), LogLevel::Info); @@ -456,6 +454,8 @@ void LoadObjects() Objects[objNum].animIndex = ReadInt32(); } + InitializeObjects(); + int staticCount = ReadCount(); TENLog("Statics: " + std::to_string(staticCount), LogLevel::Info);