Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Commit

Permalink
Fixed merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Causeless committed Dec 31, 2023
1 parent 16f16a1 commit 35545b6
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,6 @@ namespace RTE {
g_TimerMan.UpdateSim();
g_UInputMan.Update();

g_SceneMan.GetScene()->UpdateSim();

g_PerformanceMan.StartPerformanceMeasurement(PerformanceMan::SimTotal);

// TODO_MULTITHREAD
Expand All @@ -351,7 +349,7 @@ namespace RTE {
g_ActivityMan.Update();

if (g_SceneMan.GetScene()) {
g_SceneMan.GetScene()->Update();
g_SceneMan.GetScene()->UpdateSim();
}

g_LuaMan.ClearScriptTimings();
Expand Down

0 comments on commit 35545b6

Please sign in to comment.