From 1a6f1241eb85c82d4fddf7b61a867a1bb828992e Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Wed, 20 Mar 2024 00:43:53 +0100
Subject: Tweaked DefinitionEx include paths; also Parser_ss.h name is finally
 fixed

---
 StarsEx/Campaign.h          | 3 ++-
 StarsEx/CampaignPlan.h      | 1 -
 StarsEx/CampaignSaveGame.h  | 1 -
 StarsEx/CombatEvent.cpp     | 1 -
 StarsEx/Galaxy.h            | 1 -
 StarsEx/NetClientConfig.cpp | 1 -
 StarsEx/NetServerConfig.cpp | 1 -
 StarsEx/ParseUtil.h         | 4 +---
 StarsEx/Ship.cpp            | 2 --
 StarsEx/ShipDesign.h        | 3 ++-
 StarsEx/StarSystem.h        | 3 ++-
 StarsEx/Starshatter.cpp     | 1 -
 12 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'StarsEx')

diff --git a/StarsEx/Campaign.h b/StarsEx/Campaign.h
index e443648..c9bc534 100644
--- a/StarsEx/Campaign.h
+++ b/StarsEx/Campaign.h
@@ -16,11 +16,12 @@
 #ifndef Campaign_h
 #define Campaign_h
 
+#include <starshatter/definition.h>
+
 #include "Types.h"
 #include "Bitmap.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/CampaignPlan.h b/StarsEx/CampaignPlan.h
index 8dd1d09..553326e 100644
--- a/StarsEx/CampaignPlan.h
+++ b/StarsEx/CampaignPlan.h
@@ -22,7 +22,6 @@
 
 #include "Types.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/CampaignSaveGame.h b/StarsEx/CampaignSaveGame.h
index 2122715..19de787 100644
--- a/StarsEx/CampaignSaveGame.h
+++ b/StarsEx/CampaignSaveGame.h
@@ -18,7 +18,6 @@
 #include "Types.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/CombatEvent.cpp b/StarsEx/CombatEvent.cpp
index c97c20b..a42dbff 100644
--- a/StarsEx/CombatEvent.cpp
+++ b/StarsEx/CombatEvent.cpp
@@ -18,7 +18,6 @@
 #include "ShipDesign.h"
 #include "Ship.h"
 
-#include "Term.h"
 #include "ParseUtil.h"
 #include "FormatUtil.h"
 #include "DataLoader.h"
diff --git a/StarsEx/Galaxy.h b/StarsEx/Galaxy.h
index b9bb41e..417d104 100644
--- a/StarsEx/Galaxy.h
+++ b/StarsEx/Galaxy.h
@@ -19,7 +19,6 @@
 #include "Bitmap.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/NetClientConfig.cpp b/StarsEx/NetClientConfig.cpp
index c90eff9..69dda99 100644
--- a/StarsEx/NetClientConfig.cpp
+++ b/StarsEx/NetClientConfig.cpp
@@ -16,7 +16,6 @@
 #include "NetAddr.h"
 #include "NetHost.h"
 
-#include "Token.h"
 #include "Game.h"
 #include "ParseUtil.h"
 
diff --git a/StarsEx/NetServerConfig.cpp b/StarsEx/NetServerConfig.cpp
index 47197f6..73c1a8e 100644
--- a/StarsEx/NetServerConfig.cpp
+++ b/StarsEx/NetServerConfig.cpp
@@ -20,7 +20,6 @@
 #include "NetLobbyServer.h"
 #include "NetAuth.h"
 
-#include "Token.h"
 #include "Game.h"
 #include "ParseUtil.h"
 #include "VersionInfo.h"
diff --git a/StarsEx/ParseUtil.h b/StarsEx/ParseUtil.h
index 554393c..0e147e0 100644
--- a/StarsEx/ParseUtil.h
+++ b/StarsEx/ParseUtil.h
@@ -16,10 +16,8 @@
 
 #include <vector>
 
-#include <Parser_ss.h>
+#include <starshatter/definition.h>
 #include <starshatter/foundation/reader.h>
-#include <Text.h>
-#include <Token.h>
 
 #include "Types.h"
 #include "Geometry.h"
diff --git a/StarsEx/Ship.cpp b/StarsEx/Ship.cpp
index 251f92a..532d5f8 100644
--- a/StarsEx/Ship.cpp
+++ b/StarsEx/Ship.cpp
@@ -84,8 +84,6 @@
 #include "Sound.h"
 #include "Panic.h"
 
-#include "Parser_ss.h"
-
 // +----------------------------------------------------------------------+
 
 static int     base_contact_id   = 0;
diff --git a/StarsEx/ShipDesign.h b/StarsEx/ShipDesign.h
index b8dffc5..503e390 100644
--- a/StarsEx/ShipDesign.h
+++ b/StarsEx/ShipDesign.h
@@ -14,10 +14,11 @@
 #ifndef ShipDesign_h
 #define ShipDesign_h
 
+#include <starshatter/definition.h>
+
 #include "Types.h"
 #include "Bitmap.h"
 #include "Geometry.h"
-#include "Term.h"
 #include "List.h"
 
 // +----------------------------------------------------------------------+
diff --git a/StarsEx/StarSystem.h b/StarsEx/StarSystem.h
index 0dd2db1..bdd37ec 100644
--- a/StarsEx/StarSystem.h
+++ b/StarsEx/StarSystem.h
@@ -14,12 +14,13 @@
 #ifndef StarSystem_h
 #define StarSystem_h
 
+#include <starshatter/definition.h>
+
 #include "Types.h"
 #include "Solid.h"
 #include "Bitmap.h"
 #include "Geometry.h"
 #include "Text.h"
-#include "Term.h"
 #include "List.h"
 
 // +--------------------------------------------------------------------+
diff --git a/StarsEx/Starshatter.cpp b/StarsEx/Starshatter.cpp
index adb519a..7663148 100644
--- a/StarsEx/Starshatter.cpp
+++ b/StarsEx/Starshatter.cpp
@@ -79,7 +79,6 @@
 #include "NetUtil.h"
 
 #include "ParseUtil.h"
-#include "Token.h"
 
 #include "Game.h"
 #include "GameWinDX9.h"
-- 
cgit v1.1