Rotated ApplicationDX9 around into GameWinDX9

6 files changed, 19 insertions, 16 deletions

diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt
index 7247082..43836f3 100644
--- a/Stars45/CMakeLists.txt
+++ b/Stars45/CMakeLists.txt
@@ -4,7 +4,6 @@ include(GitToResource)
 add_executable(
 	Stars45 WIN32
 	ActiveWindow.cpp
-	ApplicationDX9.cpp
 	Archive.cpp
 	Asteroid.cpp
 	AudDlg.cpp
@@ -99,6 +98,7 @@ add_executable(
 	Galaxy.cpp
 	Game.cpp
 	GameScreen.cpp
+	GameWinDX9.cpp
 	Geometry.cpp
 	Graphic.cpp
 	Grid.cpp
diff --git a/Stars45/Game.h b/Stars45/Game.h
index e51ae02..033968c 100644
--- a/Stars45/Game.h
+++ b/Stars45/Game.h
@@ -10,7 +10,6 @@
 #ifndef Game_h
 #define Game_h
 
-#include "ApplicationDX9.h"
 #include "Clock.h"
 #include "Types.h"
 #include "Screen.h"
@@ -38,7 +37,7 @@ class Text;
 
 // +--------------------------------------------------------------------+
 
-class Game : public ApplicationDX9
+class Game
 {
 public:
     static const char* TYPENAME() { return "Game"; }
diff --git a/Stars45/ApplicationDX9.cpp b/Stars45/GameWinDX9.cpp
index 0a9adc6..19fe60d 100644
--- a/Stars45/ApplicationDX9.cpp
+++ b/Stars45/GameWinDX9.cpp
@@ -4,14 +4,16 @@
     Copyright (c) 1997-2006, Destroyer Studios LLC.
 */
 
-#include "ApplicationDX9.h"
+#include "GameWinDX9.h"
 
+#include "Game.h"
 
-ApplicationDX9::ApplicationDX9()
+
+GameWinDX9::GameWinDX9()
 {
 }
 
 
-ApplicationDX9::~ApplicationDX9()
+GameWinDX9::~GameWinDX9()
 {
 }
diff --git a/Stars45/ApplicationDX9.h b/Stars45/GameWinDX9.h
index e6003e7..1aee8df 100644
--- a/Stars45/ApplicationDX9.h
+++ b/Stars45/GameWinDX9.h
@@ -4,16 +4,18 @@
     Copyright (c) 1997-2006, Destroyer Studios LLC.
 */
 
-#ifndef ApplicationDX9_h
-#define ApplicationDX9_h
+#ifndef GameWinDX9_h
+#define GameWinDX9_h
 
+#include "Game.h"
 
-class ApplicationDX9
+
+class GameWinDX9 : public Game
 {
 public:
-    ApplicationDX9();
-    virtual ~ApplicationDX9();
+    GameWinDX9();
+    virtual ~GameWinDX9();
 };
 
 
-#endif  // ApplicationDX9_h
+#endif  // GameWinDX9_h
diff --git a/Stars45/StarServer.h b/Stars45/StarServer.h
index 276db41..434b3ac 100644
--- a/Stars45/StarServer.h
+++ b/Stars45/StarServer.h
@@ -11,7 +11,7 @@
 #define StarServer_h
 
 #include "Types.h"
-#include "Game.h"
+#include "GameWinDX9.h"
 #include "Bitmap.h"
 #include "KeyMap.h"
 
@@ -31,7 +31,7 @@ class NetLobbyServer;
 
 // +--------------------------------------------------------------------+
 
-class StarServer : public Game
+class StarServer : public GameWinDX9
 {
 public:
     StarServer();
diff --git a/Stars45/Starshatter.h b/Stars45/Starshatter.h
index 2d26b00..6bb9f04 100644
--- a/Stars45/Starshatter.h
+++ b/Stars45/Starshatter.h
@@ -11,7 +11,7 @@
 #define Starshatter_h
 
 #include "Types.h"
-#include "Game.h"
+#include "GameWinDX9.h"
 #include "Bitmap.h"
 #include "KeyMap.h"
 #include "Text.h"
@@ -41,7 +41,7 @@ class NetLobby;
 
 // +--------------------------------------------------------------------+
 
-class Starshatter : public Game
+class Starshatter : public GameWinDX9
 {
 public:
     Starshatter();