summaryrefslogtreecommitdiff
path: root/campaign
diff options
context:
space:
mode:
Diffstat (limited to 'campaign')
-rw-r--r--campaign/include/kurator/campaign/ShipConfig.h4
-rw-r--r--campaign/include/kurator/campaign/UniqueIdentifier.h17
2 files changed, 2 insertions, 19 deletions
diff --git a/campaign/include/kurator/campaign/ShipConfig.h b/campaign/include/kurator/campaign/ShipConfig.h
index 9aec2fa..e10251b 100644
--- a/campaign/include/kurator/campaign/ShipConfig.h
+++ b/campaign/include/kurator/campaign/ShipConfig.h
@@ -3,7 +3,7 @@
#include <string>
#include <vector>
-#include "UniqueIdentifier.h"
+#include <kurator/universe/UniqueIdentifier.h>
namespace kurator
@@ -14,7 +14,7 @@ namespace campaign
struct ShipConfig
{
- UniqueIdentifier identifier;
+ universe::UniqueIdentifier identifier;
int team;
std::string type;
std::vector<std::string> turrets;
diff --git a/campaign/include/kurator/campaign/UniqueIdentifier.h b/campaign/include/kurator/campaign/UniqueIdentifier.h
deleted file mode 100644
index 6e3c4f5..0000000
--- a/campaign/include/kurator/campaign/UniqueIdentifier.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-
-namespace kurator
-{
-namespace campaign
-{
-
-
-struct UniqueIdentifier
-{
- int id;
-};
-
-
-} // namespace campaign
-} // namespace kurator