From ba3ebf161e74c54deb7ab10621177769b479305c Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 11 Mar 2022 21:46:28 +0100 Subject: Rotated ApplicationDX9 around into GameWinDX9 --- Stars45/ApplicationDX9.cpp | 17 ----------------- Stars45/ApplicationDX9.h | 19 ------------------- Stars45/CMakeLists.txt | 2 +- Stars45/Game.h | 3 +-- Stars45/GameWinDX9.cpp | 19 +++++++++++++++++++ Stars45/GameWinDX9.h | 21 +++++++++++++++++++++ Stars45/StarServer.h | 4 ++-- Stars45/Starshatter.h | 4 ++-- 8 files changed, 46 insertions(+), 43 deletions(-) delete mode 100644 Stars45/ApplicationDX9.cpp delete mode 100644 Stars45/ApplicationDX9.h create mode 100644 Stars45/GameWinDX9.cpp create mode 100644 Stars45/GameWinDX9.h (limited to 'Stars45') diff --git a/Stars45/ApplicationDX9.cpp b/Stars45/ApplicationDX9.cpp deleted file mode 100644 index 0a9adc6..0000000 --- a/Stars45/ApplicationDX9.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* Starshatter: The Open Source Project - Copyright (c) 2021-2022, Starshatter: The Open Source Project Contributors - Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors - Copyright (c) 1997-2006, Destroyer Studios LLC. -*/ - -#include "ApplicationDX9.h" - - -ApplicationDX9::ApplicationDX9() -{ -} - - -ApplicationDX9::~ApplicationDX9() -{ -} diff --git a/Stars45/ApplicationDX9.h b/Stars45/ApplicationDX9.h deleted file mode 100644 index e6003e7..0000000 --- a/Stars45/ApplicationDX9.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Starshatter: The Open Source Project - Copyright (c) 2021-2022, Starshatter: The Open Source Project Contributors - Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors - Copyright (c) 1997-2006, Destroyer Studios LLC. -*/ - -#ifndef ApplicationDX9_h -#define ApplicationDX9_h - - -class ApplicationDX9 -{ -public: - ApplicationDX9(); - virtual ~ApplicationDX9(); -}; - - -#endif // ApplicationDX9_h 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/GameWinDX9.cpp b/Stars45/GameWinDX9.cpp new file mode 100644 index 0000000..19fe60d --- /dev/null +++ b/Stars45/GameWinDX9.cpp @@ -0,0 +1,19 @@ +/* Starshatter: The Open Source Project + Copyright (c) 2021-2022, Starshatter: The Open Source Project Contributors + Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors + Copyright (c) 1997-2006, Destroyer Studios LLC. +*/ + +#include "GameWinDX9.h" + +#include "Game.h" + + +GameWinDX9::GameWinDX9() +{ +} + + +GameWinDX9::~GameWinDX9() +{ +} diff --git a/Stars45/GameWinDX9.h b/Stars45/GameWinDX9.h new file mode 100644 index 0000000..1aee8df --- /dev/null +++ b/Stars45/GameWinDX9.h @@ -0,0 +1,21 @@ +/* Starshatter: The Open Source Project + Copyright (c) 2021-2022, Starshatter: The Open Source Project Contributors + Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors + Copyright (c) 1997-2006, Destroyer Studios LLC. +*/ + +#ifndef GameWinDX9_h +#define GameWinDX9_h + +#include "Game.h" + + +class GameWinDX9 : public Game +{ +public: + GameWinDX9(); + virtual ~GameWinDX9(); +}; + + +#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(); -- cgit v1.1