diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/RaceManager.cpp | 3 | ||||
| -rw-r--r-- | src/engine/editor/Editor.cpp | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/engine/RaceManager.cpp b/src/engine/RaceManager.cpp index 700792426..733b252a5 100644 --- a/src/engine/RaceManager.cpp +++ b/src/engine/RaceManager.cpp @@ -137,12 +137,15 @@ void RaceManager::SetItemTables() { switch (gPlayerCountSelection1) { case TWO_PLAYERS_SELECTED: humanTableName = "mk:versus_2p"; + cpuTableName = "mk:versus_2p"; // Required for demo mode to work break; case THREE_PLAYERS_SELECTED: humanTableName = "mk:versus_3p"; + cpuTableName = "mk:versus_3p"; break; case FOUR_PLAYERS_SELECTED: humanTableName = "mk:versus_4p"; + cpuTableName = "mk:versus_4p"; break; } break; diff --git a/src/engine/editor/Editor.cpp b/src/engine/editor/Editor.cpp index 673667088..ba29dc8e2 100644 --- a/src/engine/editor/Editor.cpp +++ b/src/engine/editor/Editor.cpp @@ -52,11 +52,11 @@ namespace TrackEditor { bIsEditorPaused = true; CVarSetInteger("gFreecam", true); CM_SetFreeCamera(true); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Tools")->Show(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Scene Explorer")->Show(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Content Browser")->Show(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Track Properties")->Show(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Properties")->Show(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Tools")->Show(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Scene Explorer")->Show(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Content Browser")->Show(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Track Properties")->Show(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Properties")->Show(); } void Editor::Disable() { @@ -64,11 +64,11 @@ namespace TrackEditor { bIsEditorPaused = false; CVarSetInteger("gFreecam", false); CM_SetFreeCamera(false); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Tools")->Hide(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Scene Explorer")->Hide(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Content Browser")->Hide(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Track Properties")->Hide(); - Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Properties")->Hide(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Tools")->Hide(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Scene Explorer")->Hide(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Content Browser")->Hide(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Track Properties")->Hide(); + Ship::Context::GetRawInstance()->GetWindow()->GetGui()->GetGuiWindow("Properties")->Hide(); } bool Editor::IsEnabled() { |