From b8018588d27e84fb6679ec22aa907bdfdc8b6e88 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 19:08:17 +0200 Subject: Fixed annoying warning regarding extras in endif --- Stars45/Campaign.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Stars45/Campaign.h') diff --git a/Stars45/Campaign.h b/Stars45/Campaign.h index 4465186..a993e84 100644 --- a/Stars45/Campaign.h +++ b/Stars45/Campaign.h @@ -302,5 +302,5 @@ protected: int lockout; }; -#endif Campaign_h +#endif // Campaign_h -- cgit v1.1 From d2fc3ad2272f7cc850ef95fbe803c10e8746ad86 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 21:34:32 +0200 Subject: Switched to long doubles instead of doing manual FPU manipulation --- Stars45/Campaign.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Stars45/Campaign.h') diff --git a/Stars45/Campaign.h b/Stars45/Campaign.h index a993e84..ecfa236 100644 --- a/Stars45/Campaign.h +++ b/Stars45/Campaign.h @@ -213,13 +213,13 @@ public: void SetMissionId(int id); int GetMissionId() const { return mission_id; } Bitmap* GetImage(int n) { return &image[n]; } - double GetTime() const { return time; } - double GetStartTime() const { return startTime; } - void SetStartTime(double t) { startTime = t; } - double GetLoadTime() const { return loadTime; } - void SetLoadTime(double t) { loadTime = t; } - double GetUpdateTime() const { return updateTime; } - void SetUpdateTime(double t) { updateTime = t; } + long double GetTime() const { return time; } + long double GetStartTime() const { return startTime; } + void SetStartTime(long double t) { startTime = t; } + long double GetLoadTime() const { return loadTime; } + void SetLoadTime(long double t) { loadTime = t; } + long double GetUpdateTime() const { return updateTime; } + void SetUpdateTime(long double t) { updateTime = t; } bool InCutscene() const; bool IsDynamic() const; @@ -246,7 +246,7 @@ public: static Campaign* SelectCampaign(const char* name); static Campaign* CreateCustomCampaign(const char* name, const char* path); - static double Stardate(); + static long double Stardate(); protected: void LoadCampaign(DataLoader* loader, bool full=false); @@ -295,10 +295,10 @@ protected: Mission* mission; Mission* net_mission; - double time; - double loadTime; - double startTime; - double updateTime; + long double time; + long double loadTime; + long double startTime; + long double updateTime; int lockout; }; -- cgit v1.1