diff options
-rw-r--r-- | StarsEx/Game.cpp | 21 | ||||
-rw-r--r-- | StarsEx/Game.h | 14 | ||||
-rw-r--r-- | StarsEx/GameWinDX9.cpp | 2 | ||||
-rw-r--r-- | StarsEx/Keyboard.cpp | 3 | ||||
-rw-r--r-- | StarsEx/NPClientWraps.cpp | 2 | ||||
-rw-r--r-- | StarsEx/NavAI.cpp | 5 | ||||
-rw-r--r-- | Starserver/Main.cpp | 7 | ||||
-rw-r--r-- | Starserver/NetAdminChat.cpp | 27 | ||||
-rw-r--r-- | Starserver/NetAdminChat.h | 18 | ||||
-rw-r--r-- | Starserver/NetAdminServer.cpp | 28 | ||||
-rw-r--r-- | Starserver/NetAdminServer.h | 14 | ||||
-rw-r--r-- | Starserver/NetFileServlet.cpp | 17 | ||||
-rw-r--r-- | Starserver/NetFileServlet.h | 27 | ||||
-rw-r--r-- | Starserver/StarServer.cpp | 52 | ||||
-rw-r--r-- | Starserver/StarServer.h | 20 |
15 files changed, 119 insertions, 138 deletions
diff --git a/StarsEx/Game.cpp b/StarsEx/Game.cpp index a7fd991..90fcf62 100644 --- a/StarsEx/Game.cpp +++ b/StarsEx/Game.cpp @@ -8,18 +8,14 @@ */ #include "Game.h" + +#include <cstdint> + +#include "Clock.h" +#include "ContentBundle.h" #include "Mouse.h" -#include "Universe.h" -#include "Window.h" -#include "UIEventDispatch.h" #include "Panic.h" -#include "Pcx.h" -#include "Bitmap.h" -#include "VideoSettings.h" -#include "ContentBundle.h" -#include "Clock.h" -#include "WndProc.h" -#include "SoundCard.h" +#include "UIEventDispatch.h" Game* Game::instance {nullptr}; @@ -50,7 +46,7 @@ Game::~Game() // +--------------------------------------------------------------------+ bool -Game::Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow) +Game::Init() { status = OK; @@ -172,7 +168,8 @@ Game::GetInstance() // +--------------------------------------------------------------------+ -DWORD Game::Frame() +std::uint32_t +Game::Frame() { return frame_number; } diff --git a/StarsEx/Game.h b/StarsEx/Game.h index 50b3379..878f2d0 100644 --- a/StarsEx/Game.h +++ b/StarsEx/Game.h @@ -10,9 +10,8 @@ #ifndef Game_h #define Game_h -#include "Types.h" +#include <cstdint> -// +--------------------------------------------------------------------+ class Game { @@ -33,11 +32,7 @@ public: Game(); virtual ~Game(); - // - // MAIN GAME FUNCTIONALITY: - // - - virtual bool Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow); + virtual bool Init(); virtual int Run(); virtual void Exit(); @@ -54,7 +49,7 @@ public: static Game* GetInstance(); - DWORD Frame(); + std::uint32_t Frame(); bool Active() const { return active; } bool Paused() const { return paused; } @@ -75,12 +70,11 @@ protected: bool active; bool paused; - DWORD frame_number; + std::uint32_t frame_number; private: static Game* instance; }; -// +--------------------------------------------------------------------+ #endif // Game_h diff --git a/StarsEx/GameWinDX9.cpp b/StarsEx/GameWinDX9.cpp index 9f5595d..236c512 100644 --- a/StarsEx/GameWinDX9.cpp +++ b/StarsEx/GameWinDX9.cpp @@ -105,7 +105,7 @@ GameWinDX9::Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow) if (status != OK) return false; - return Game::Init(hi, hpi, cmdline, nCmdShow); + return Game::Init(); } diff --git a/StarsEx/Keyboard.cpp b/StarsEx/Keyboard.cpp index 63b93e9..c4e2d26 100644 --- a/StarsEx/Keyboard.cpp +++ b/StarsEx/Keyboard.cpp @@ -12,7 +12,8 @@ */ #include "Keyboard.h" -#include "Game.h" + +#include "Types.h" // +--------------------------------------------------------------------+ diff --git a/StarsEx/NPClientWraps.cpp b/StarsEx/NPClientWraps.cpp index 0705696..92d5561 100644 --- a/StarsEx/NPClientWraps.cpp +++ b/StarsEx/NPClientWraps.cpp @@ -21,8 +21,8 @@ // * // ******************************************************************************* // -#include "Game.h" #include "Text.h" +#include "Types.h" #include "NPClient.h" #include "NPClientWraps.h" diff --git a/StarsEx/NavAI.cpp b/StarsEx/NavAI.cpp index ad897d0..609c4ab 100644 --- a/StarsEx/NavAI.cpp +++ b/StarsEx/NavAI.cpp @@ -27,8 +27,6 @@ #include "KeyMap.h" #include "HUDView.h" #include "HUDSounds.h" - -#include "Game.h" #include "ContentBundle.h" // +----------------------------------------------------------------------+ @@ -616,6 +614,3 @@ NavAI::AvoidTerrain() return avoid; } - - - diff --git a/Starserver/Main.cpp b/Starserver/Main.cpp index a92df86..ef1a611 100644 --- a/Starserver/Main.cpp +++ b/Starserver/Main.cpp @@ -7,17 +7,18 @@ #include <InfoEx.h> #include <NetLayer.h> #include <Panic.h> -#include <StarServer.h> #include <Token.h> #include <Utils.h> #include <VersionInfo.h> +#include "StarServer.h" + int dump_missions = 0; int -main(int argc, char * argv[]) +main(int, char*[]) { AssignErrLog(fopen("serverlog.txt", "wb")); Print("Starserver %s\n", versionInfo); @@ -26,7 +27,7 @@ main(int argc, char * argv[]) try { NetLayer net; StarServer server; - if (server.Init(nullptr, nullptr, nullptr, 0)) + if (server.Init()) result = server.Run(); } catch (const char* err) { diff --git a/Starserver/NetAdminChat.cpp b/Starserver/NetAdminChat.cpp index 359173a..b8241b5 100644 --- a/Starserver/NetAdminChat.cpp +++ b/Starserver/NetAdminChat.cpp @@ -8,25 +8,28 @@ OVERVIEW ======== - HTTP Servlet Engine for Multiplayer Admin + HTTP Servlet Engine for Admin Chat */ - #include "NetAdminChat.h" -#include "NetLobbyServer.h" -#include "NetServerConfig.h" -#include "NetUser.h" -#include "NetChat.h" -#include "NetUtil.h" -#include "HttpServlet.h" -#include "NetLayer.h" -#include "FormatUtil.h" +#include <FormatUtil.h> +#include <HttpRequest.h> +#include <HttpResponse.h> +#include <HttpServlet.h> +#include <List.h> +#include <NetChat.h> +#include <NetLayer.h> +#include <NetLobbyServer.h> +#include <NetServerConfig.h> +#include <NetUser.h> +#include <NetUtil.h> +#include <Text.h> // +-------------------------------------------------------------------+ -NetAdminChat::NetAdminChat() -{ } +NetAdminChat::NetAdminChat() {} +NetAdminChat::~NetAdminChat() {} // +-------------------------------------------------------------------+ diff --git a/Starserver/NetAdminChat.h b/Starserver/NetAdminChat.h index 2ce1fba..6295f40 100644 --- a/Starserver/NetAdminChat.h +++ b/Starserver/NetAdminChat.h @@ -8,25 +8,23 @@ OVERVIEW ======== - HTTP Servlet Engine for Multiplayer Admin + HTTP Servlet Engine for Admin Chat */ +#pragma once -#ifndef NetAdminChat_h -#define NetAdminChat_h +#include <HttpRequest.h> +#include <HttpResponse.h> +#include <Text.h> #include "NetAdminServer.h" -// +-------------------------------------------------------------------+ class NetAdminChat : public NetAdminServlet { public: NetAdminChat(); - virtual ~NetAdminChat() { } - - virtual bool DoGet(HttpRequest& request, HttpResponse& response); - virtual Text GetContent(); + virtual ~NetAdminChat(); + virtual bool DoGet(HttpRequest& request, HttpResponse& response); + virtual Text GetContent(); }; - -#endif // NetAdminChat_h
\ No newline at end of file diff --git a/Starserver/NetAdminServer.cpp b/Starserver/NetAdminServer.cpp index 190931b..c30880b 100644 --- a/Starserver/NetAdminServer.cpp +++ b/Starserver/NetAdminServer.cpp @@ -11,21 +11,25 @@ HTTP Servlet Engine for Multiplayer Admin */ - #include "NetAdminServer.h" -#include "NetLobbyServer.h" -#include "NetServerConfig.h" -#include "NetClientConfig.h" -#include "NetAdminChat.h" -#include "NetUser.h" -#include "NetChat.h" -#include "HttpServlet.h" -#include "NetLayer.h" +#include <DataLoader.h> +#include <FormatUtil.h> +#include <HttpRequest.h> +#include <HttpResponse.h> +#include <HttpServlet.h> +#include <List.h> +#include <NetChat.h> +#include <NetClientConfig.h> +#include <NetLayer.h> +#include <NetLobbyServer.h> +#include <NetServerConfig.h> +#include <NetUser.h> +#include <Text.h> +#include <Types.h> +#include <VersionInfo.h> -#include "DataLoader.h" -#include "FormatUtil.h" -#include "VersionInfo.h" +#include "NetAdminChat.h" // +-------------------------------------------------------------------+ // +-------------------------------------------------------------------+ diff --git a/Starserver/NetAdminServer.h b/Starserver/NetAdminServer.h index 804d482..5c009e8 100644 --- a/Starserver/NetAdminServer.h +++ b/Starserver/NetAdminServer.h @@ -11,12 +11,14 @@ HTTP Servlet Engine for Multiplayer Admin */ +#pragma once -#ifndef NetAdminServer_h -#define NetAdminServer_h - -#include "HttpServletExec.h" -#include "HttpServlet.h" +#include <HttpRequest.h> +#include <HttpResponse.h> +#include <HttpServletExec.h> +#include <HttpServlet.h> +#include <List.h> +#include <Types.h> // +-------------------------------------------------------------------+ @@ -86,5 +88,3 @@ protected: NetAdminServer* admin; NetUser* user; }; - -#endif // NetAdminServer_h
\ No newline at end of file diff --git a/Starserver/NetFileServlet.cpp b/Starserver/NetFileServlet.cpp index 6b23d9d..431bdb6 100644 --- a/Starserver/NetFileServlet.cpp +++ b/Starserver/NetFileServlet.cpp @@ -11,14 +11,16 @@ HTTP Servlet for File Transfer */ - #include "NetFileServlet.h" -#include "NetAdminServer.h" -#include "NetLayer.h" -#include "DataLoader.h" +#include <DataLoader.h> +#include <Text.h> +#include <Types.h> + + +NetFileServlet::NetFileServlet() {} +NetFileServlet::~NetFileServlet() {} -// +-------------------------------------------------------------------+ bool NetFileServlet::DoGet(HttpRequest& request, HttpResponse& response) @@ -57,7 +59,10 @@ NetFileServlet::DoGet(HttpRequest& request, HttpResponse& response) return true; } -// +-------------------------------------------------------------------+ + +NetWebServlet::NetWebServlet() {} +NetWebServlet::~NetWebServlet() {} + bool NetWebServlet::DoGet(HttpRequest& request, HttpResponse& response) diff --git a/Starserver/NetFileServlet.h b/Starserver/NetFileServlet.h index 7de3443..3d21043 100644 --- a/Starserver/NetFileServlet.h +++ b/Starserver/NetFileServlet.h @@ -11,39 +11,28 @@ HTTP Servlet for File Transfer */ +#pragma once -#ifndef NetFileServlet_h -#define NetFileServlet_h +#include <HttpRequest.h> +#include <HttpResponse.h> +#include <NetUser.h> -#include "Types.h" #include "NetAdminServer.h" -#include "NetUser.h" -// +-------------------------------------------------------------------+ - -class Campaign; -class File; - -// +-------------------------------------------------------------------+ class NetFileServlet : public NetAdminServlet { public: - NetFileServlet() { } - virtual ~NetFileServlet() { } - + NetFileServlet(); + virtual ~NetFileServlet(); virtual bool DoGet(HttpRequest& request, HttpResponse& response); }; -// +-------------------------------------------------------------------+ class NetWebServlet : public NetAdminServlet { public: - NetWebServlet() { } - virtual ~NetWebServlet() { } - + NetWebServlet(); + virtual ~NetWebServlet(); virtual bool DoGet(HttpRequest& request, HttpResponse& response); }; - -#endif // NetFileServlet_h
\ No newline at end of file diff --git a/Starserver/StarServer.cpp b/Starserver/StarServer.cpp index ab3d0fb..ea10639 100644 --- a/Starserver/StarServer.cpp +++ b/Starserver/StarServer.cpp @@ -4,7 +4,6 @@ Copyright (c) 1997-2006, Destroyer Studios LLC. AUTHOR: John DiCamillo - */ #include "StarServer.h" @@ -13,30 +12,31 @@ #include <iostream> #include <thread> -#include "Campaign.h" -#include "Clock.h" -#include "CombatRoster.h" -#include "DataLoader.h" -#include "Drive.h" -#include "Explosion.h" -#include "FlightDeck.h" -#include "Galaxy.h" -#include "Game.h" -#include "ModConfig.h" +#include <Campaign.h> +#include <Clock.h> +#include <CombatRoster.h> +#include <DataLoader.h> +#include <Drive.h> +#include <Explosion.h> +#include <FlightDeck.h> +#include <Galaxy.h> +#include <Game.h> +#include <ModConfig.h> +#include <NetGame.cpp> +#include <NetLobby.h> +#include <NetLobbyServer.h> +#include <NetServerConfig.h> +#include <RadioTraffic.h> +#include <Random.h> +#include <Ship.h> +#include <Shot.h> +#include <Sim.h> +#include <SystemDesign.h> +#include <Types.h> +#include <Utils.h> +#include <WeaponDesign.h> + #include "NetAdminServer.h" -#include "NetGame.cpp" -#include "NetLobby.h" -#include "NetLobbyServer.h" -#include "NetServerConfig.h" -#include "RadioTraffic.h" -#include "Random.h" -#include "Ship.h" -#include "Shot.h" -#include "Sim.h" -#include "SystemDesign.h" -#include "Types.h" -#include "Utils.h" -#include "WeaponDesign.h" StarServer* StarServer::instance {nullptr}; @@ -109,11 +109,11 @@ StarServer::~StarServer() bool -StarServer::Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow) +StarServer::Init() { if (auto loader = DataLoader::GetLoader()) loader->UseFileSystem(false); - return Game::Init(hi, hpi, cmdline, nCmdShow); + return Game::Init(); } diff --git a/Starserver/StarServer.h b/Starserver/StarServer.h index 0bcab06..68f69f2 100644 --- a/Starserver/StarServer.h +++ b/Starserver/StarServer.h @@ -4,18 +4,15 @@ Copyright (c) 1997-2006, Destroyer Studios LLC. AUTHOR: John DiCamillo - */ -#ifndef StarServer_h -#define StarServer_h +#pragma once -#include "Game.h" -#include "NetLobbyServer.h" -#include "NetServer.h" -#include "Mission.h" -#include "Types.h" -#include "Universe.h" +#include <Game.h> +#include <Mission.h> +#include <NetLobbyServer.h> +#include <NetServer.h> +#include <Universe.h> class StarServer : public Game @@ -26,7 +23,7 @@ public: StarServer(); virtual ~StarServer(); - virtual bool Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow); + virtual bool Init(); virtual bool InitGame(); virtual void UpdateWorld(); @@ -49,6 +46,3 @@ protected: private: static StarServer* instance; }; - - -#endif // StarServer_h |