1 files changed, 11 insertions, 11 deletions

diff --git a/Stars45/Starshatter.cpp b/Stars45/Starshatter.cpp
index eb971e8..6c48e32 100644
--- a/Stars45/Starshatter.cpp
+++ b/Stars45/Starshatter.cpp
@@ -457,7 +457,7 @@ Starshatter::InitGame()
         SetupSplash();
     }
 
-    time_mark = Game::GetInstance()->GameTime();
+    time_mark = Game::GetInstance()->GetClock()->GameTime();
     minutes   = 0;
 
     return true;
@@ -1089,7 +1089,7 @@ Starshatter::GameState()
     }
 
     if (game_mode == EXIT_MODE) {
-        exit_time -= Game::GetInstance()->GUITime();
+        exit_time -= Game::GetInstance()->GetClock()->GuiDelta();
 
         if (exit_time <= 0)
         Game::Exit();
@@ -1115,7 +1115,7 @@ Starshatter::DoMenuScreenFrame()
     }
 
     if (time_til_change > 0)
-    time_til_change -= Game::GetInstance()->GUITime();
+    time_til_change -= Game::GetInstance()->GetClock()->GuiDelta();
 
     if (!menuscreen)
     return;
@@ -1177,7 +1177,7 @@ Starshatter::DoPlanScreenFrame()
     Mouse::SetCursor(Mouse::ARROW);
 
     if (time_til_change > 0)
-    time_til_change -= Game::GetInstance()->GUITime();
+    time_til_change -= Game::GetInstance()->GetClock()->GuiDelta();
 
     if (KeyDown(KEY_EXIT)) {
         if (time_til_change <= 0) {
@@ -1210,7 +1210,7 @@ Starshatter::DoCmpnScreenFrame()
     Mouse::SetCursor(Mouse::ARROW);
 
     if (time_til_change > 0)
-    time_til_change -= Game::GetInstance()->GUITime();
+    time_til_change -= Game::GetInstance()->GetClock()->GuiDelta();
 
     exit_latch = KeyDown(KEY_EXIT) ? true : false;
 
@@ -1504,7 +1504,7 @@ Starshatter::DoGameScreenFrame()
     }
 
     if (time_til_change > 0)
-    time_til_change -= Game::GetInstance()->GUITime();
+    time_til_change -= Game::GetInstance()->GetClock()->GuiDelta();
 
     if (exit_latch && !KeyDown(KEY_EXIT))
     exit_latch = false;
@@ -1572,8 +1572,8 @@ Starshatter::DoGameScreenFrame()
     gamescreen->FrameRate(frame_rate);
     gamescreen->ExecFrame();
 
-    if (Game::GetInstance()->GameTime() - time_mark > 60000) {
-        time_mark = Game::GetInstance()->GameTime();
+    if (Game::GetInstance()->GetClock()->GameTime() - time_mark > 60000) {
+        time_mark = Game::GetInstance()->GetClock()->GameTime();
         minutes++;
         if (minutes > 60)
         Print("  TIME %2d:%02d:00\n", minutes/60, minutes%60);
@@ -1829,7 +1829,7 @@ Starshatter::DoGameKeys()
     }
 
     if (cam_dir) {
-        double spin = (PI/2) * Game::GetInstance()->FrameTime(); // Game::GetInstance()->GUITime();
+        double spin = (PI/2) * Game::GetInstance()->GetClock()->Delta(); // Game::GetInstance()->GetClock()->GuiDelta();
 
         if (KeyDown(KEY_CAM_EXT_PLUS_AZ))
         cam_dir->ExternalAzimuth(spin);
@@ -1857,13 +1857,13 @@ Starshatter::DoGameKeys()
 
         if (KeyDown(KEY_CAM_EXT_PLUS_RANGE)){
             if (!gamescreen->IsNavShown()) {
-                cam_dir->ExternalRange((float) (1 + 1.5 * Game::GetInstance()->FrameTime())); // 1.1f);
+                cam_dir->ExternalRange((float) (1 + 1.5 * Game::GetInstance()->GetClock()->Delta())); // 1.1f);
             }
         }
 
         else if (KeyDown(KEY_CAM_EXT_MINUS_RANGE)) {
             if (!gamescreen->IsNavShown()) {
-                cam_dir->ExternalRange((float) (1 - 1.5 * Game::GetInstance()->FrameTime())); // 0.9f);
+                cam_dir->ExternalRange((float) (1 - 1.5 * Game::GetInstance()->GetClock()->Delta())); // 0.9f);
             }
         }