From 27216f78d7a08ffd14ad7040f76c8078ecdfd993 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 2 Jan 2023 00:47:48 +0100 Subject: Moved UniqueIdentifier to universe module --- campaign/include/kurator/campaign/ShipConfig.h | 4 ++-- campaign/include/kurator/campaign/UniqueIdentifier.h | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 campaign/include/kurator/campaign/UniqueIdentifier.h (limited to 'campaign/include') 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 #include -#include "UniqueIdentifier.h" +#include namespace kurator @@ -14,7 +14,7 @@ namespace campaign struct ShipConfig { - UniqueIdentifier identifier; + universe::UniqueIdentifier identifier; int team; std::string type; std::vector 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 -- cgit v1.1