Removed overridden Run function of GameWinDX9

4 files changed, 19 insertions, 15 deletions

diff --git a/StarsEx/Game.cpp b/StarsEx/Game.cpp
index 41375f9..a127bb8 100644
--- a/StarsEx/Game.cpp
+++ b/StarsEx/Game.cpp
@@ -104,6 +104,7 @@ Game::Run()
     status = RUN;
     Clock::GetInstance()->Set();
     while (status < EXIT && !Panic::Panicked()) {
+        PumpEvents();
         GameLoop();
     }
     return exit_code;
@@ -137,6 +138,13 @@ Game::Pause(bool f)
 // +--------------------------------------------------------------------+
 
 void
+Game::PumpEvents()
+{
+}
+
+// +--------------------------------------------------------------------+
+
+void
 Game::GameLoop()
 {
     if (active) {
diff --git a/StarsEx/Game.h b/StarsEx/Game.h
index 7469657..6f0c58c 100644
--- a/StarsEx/Game.h
+++ b/StarsEx/Game.h
@@ -69,6 +69,7 @@ public:
     bool              Server()       { return server;     }
     bool              ShowMouse()    { return show_mouse; }
 
+    virtual void      PumpEvents();
     virtual void      GameLoop();
     virtual void      UpdateWorld();
     virtual void      GameState();
diff --git a/StarsEx/GameWinDX9.cpp b/StarsEx/GameWinDX9.cpp
index 6e779c7..4b5b2d8 100644
--- a/StarsEx/GameWinDX9.cpp
+++ b/StarsEx/GameWinDX9.cpp
@@ -568,25 +568,20 @@ GameWinDX9::LoadPalette(PALETTEENTRY* pal, BYTE* inv)
 }
 
 
-int
-GameWinDX9::Run()
+void
+GameWinDX9::PumpEvents()
 {
     MSG msg;
-    status = RUN;
-    Clock::GetInstance()->Set();
-    while (status < EXIT && !Panic::Panicked()) {
-        if (PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE)) {
-            if (msg.message == WM_QUIT)
+    while (PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE)) {
+        if (msg.message == WM_QUIT) {
+            if (!exit_code)
+                exit_code = msg.wParam;
+            Exit();
             break;
-
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-        else {
-            GameLoop();
         }
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
     }
-    return exit_code ? exit_code : msg.wParam;
 }
 
 
diff --git a/StarsEx/GameWinDX9.h b/StarsEx/GameWinDX9.h
index e95352b..c6862da 100644
--- a/StarsEx/GameWinDX9.h
+++ b/StarsEx/GameWinDX9.h
@@ -40,7 +40,7 @@ public:
     virtual bool SetupPalette();
     virtual bool LoadPalette(PALETTEENTRY* pal, BYTE* inv);
 
-    virtual int Run() override;
+    virtual void PumpEvents() override;
     virtual void UpdateScreen() override;
     virtual void Activate(bool f) override;
     virtual void Pause(bool f) override;