From 2f7d5c306430d65d18eac184551bac8937877d49 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 3 Dec 2022 00:44:57 +0100 Subject: Renamed all battles module and ns references to sim --- sim/CMakeLists.txt | 2 +- sim/include/kurator/sim/Battle.h | 4 ++-- sim/include/kurator/sim/Point.h | 4 ++-- sim/include/kurator/sim/Scenario.h | 4 ++-- sim/include/kurator/sim/ShipConfig.h | 4 ++-- sim/include/kurator/sim/components.h | 4 ++-- sim/include/kurator/sim/events.h | 4 ++-- sim/include/kurator/sim/scenarios.h | 4 ++-- sim/src/BaseBattle.cpp | 10 +++++----- sim/src/BaseBattle.h | 8 ++++---- sim/src/Battle.cpp | 8 ++++---- sim/src/Builder.cpp | 8 ++++---- sim/src/Builder.h | 4 ++-- sim/src/Point.cpp | 6 +++--- sim/src/RandomSpawner.cpp | 8 ++++---- sim/src/RandomSpawner.h | 6 +++--- sim/src/Scenario.cpp | 6 +++--- sim/src/Spawner.h | 6 +++--- sim/src/TeamManager.cpp | 4 ++-- sim/src/TeamManager.h | 4 ++-- sim/src/scenarios.cpp | 8 ++++---- 21 files changed, 58 insertions(+), 58 deletions(-) (limited to 'sim') diff --git a/sim/CMakeLists.txt b/sim/CMakeLists.txt index f7478e3..fd7d75a 100644 --- a/sim/CMakeLists.txt +++ b/sim/CMakeLists.txt @@ -1,4 +1,4 @@ -project(battles) +project(sim) add_library( ${PROJECT_NAME} src/BaseBattle.cpp diff --git a/sim/include/kurator/sim/Battle.h b/sim/include/kurator/sim/Battle.h index 1542597..e1728f4 100644 --- a/sim/include/kurator/sim/Battle.h +++ b/sim/include/kurator/sim/Battle.h @@ -10,7 +10,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -27,5 +27,5 @@ public: auto prepare(const Scenario& scenario) -> std::unique_ptr; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/include/kurator/sim/Point.h b/sim/include/kurator/sim/Point.h index ba9ab63..afd30ba 100644 --- a/sim/include/kurator/sim/Point.h +++ b/sim/include/kurator/sim/Point.h @@ -3,7 +3,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -22,5 +22,5 @@ struct Point }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/include/kurator/sim/Scenario.h b/sim/include/kurator/sim/Scenario.h index afbb74c..b037365 100644 --- a/sim/include/kurator/sim/Scenario.h +++ b/sim/include/kurator/sim/Scenario.h @@ -8,7 +8,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -20,5 +20,5 @@ struct Scenario }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/include/kurator/sim/ShipConfig.h b/sim/include/kurator/sim/ShipConfig.h index 2066430..bb089ac 100644 --- a/sim/include/kurator/sim/ShipConfig.h +++ b/sim/include/kurator/sim/ShipConfig.h @@ -6,7 +6,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -18,5 +18,5 @@ struct ShipConfig }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/include/kurator/sim/components.h b/sim/include/kurator/sim/components.h index d4363c4..41c8053 100644 --- a/sim/include/kurator/sim/components.h +++ b/sim/include/kurator/sim/components.h @@ -7,7 +7,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -55,5 +55,5 @@ struct TurretControl }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/include/kurator/sim/events.h b/sim/include/kurator/sim/events.h index 0e4af14..cacf443 100644 --- a/sim/include/kurator/sim/events.h +++ b/sim/include/kurator/sim/events.h @@ -5,7 +5,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -17,5 +17,5 @@ struct Hit }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/include/kurator/sim/scenarios.h b/sim/include/kurator/sim/scenarios.h index 3d7e697..d22b62a 100644 --- a/sim/include/kurator/sim/scenarios.h +++ b/sim/include/kurator/sim/scenarios.h @@ -5,7 +5,7 @@ namespace kurator { -namespace battles +namespace sim { namespace scenarios { @@ -15,5 +15,5 @@ Scenario example(); } // namespace scenarios -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/BaseBattle.cpp b/sim/src/BaseBattle.cpp index 33e0957..3b56b0a 100644 --- a/sim/src/BaseBattle.cpp +++ b/sim/src/BaseBattle.cpp @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "Builder.h" @@ -16,7 +16,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -158,5 +158,5 @@ BaseBattle::kill_off_dead() } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/BaseBattle.h b/sim/src/BaseBattle.h index 8240fd2..13d7457 100644 --- a/sim/src/BaseBattle.h +++ b/sim/src/BaseBattle.h @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include "RandomSpawner.h" #include "TeamManager.h" @@ -12,7 +12,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -36,5 +36,5 @@ private: }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/Battle.cpp b/sim/src/Battle.cpp index f44a88e..f8eacb5 100644 --- a/sim/src/Battle.cpp +++ b/sim/src/Battle.cpp @@ -1,15 +1,15 @@ -#include +#include #include -#include +#include #include "BaseBattle.h" namespace kurator { -namespace battles +namespace sim { @@ -20,5 +20,5 @@ prepare(const Scenario& scenario) } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/Builder.cpp b/sim/src/Builder.cpp index d7cc893..dd10326 100644 --- a/sim/src/Builder.cpp +++ b/sim/src/Builder.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include #include #include @@ -12,7 +12,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -53,5 +53,5 @@ Builder::operator()(const universe::TurretType& turret_type, const entt::entity& } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/Builder.h b/sim/src/Builder.h index df50c4e..31c7120 100644 --- a/sim/src/Builder.h +++ b/sim/src/Builder.h @@ -10,7 +10,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -31,5 +31,5 @@ private: }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/Point.cpp b/sim/src/Point.cpp index 31aecae..1f49774 100644 --- a/sim/src/Point.cpp +++ b/sim/src/Point.cpp @@ -1,11 +1,11 @@ -#include +#include #include namespace kurator { -namespace battles +namespace sim { @@ -68,5 +68,5 @@ Point::operator+(const Point& other) const } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/RandomSpawner.cpp b/sim/src/RandomSpawner.cpp index b85d140..8c401b2 100644 --- a/sim/src/RandomSpawner.cpp +++ b/sim/src/RandomSpawner.cpp @@ -2,13 +2,13 @@ #include -#include -#include +#include +#include namespace kurator { -namespace battles +namespace sim { @@ -38,5 +38,5 @@ RandomSpawner::get(const int team) } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/RandomSpawner.h b/sim/src/RandomSpawner.h index 1ef2f20..d34e1ba 100644 --- a/sim/src/RandomSpawner.h +++ b/sim/src/RandomSpawner.h @@ -2,14 +2,14 @@ #include -#include +#include #include "Spawner.h" namespace kurator { -namespace battles +namespace sim { @@ -26,5 +26,5 @@ private: }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/Scenario.cpp b/sim/src/Scenario.cpp index 49a9c7c..49201c3 100644 --- a/sim/src/Scenario.cpp +++ b/sim/src/Scenario.cpp @@ -1,9 +1,9 @@ -#include +#include namespace kurator { -namespace battles +namespace sim { @@ -19,5 +19,5 @@ Scenario::total_teams() const } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/Spawner.h b/sim/src/Spawner.h index ebae699..ae3f2fd 100644 --- a/sim/src/Spawner.h +++ b/sim/src/Spawner.h @@ -1,11 +1,11 @@ #pragma once -#include +#include namespace kurator { -namespace battles +namespace sim { @@ -17,5 +17,5 @@ public: }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/TeamManager.cpp b/sim/src/TeamManager.cpp index 9dc90e3..2dc3196 100644 --- a/sim/src/TeamManager.cpp +++ b/sim/src/TeamManager.cpp @@ -10,7 +10,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -58,5 +58,5 @@ TeamManager::clear(entt::registry& registry) } -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/TeamManager.h b/sim/src/TeamManager.h index 384d9ee..abc6d23 100644 --- a/sim/src/TeamManager.h +++ b/sim/src/TeamManager.h @@ -8,7 +8,7 @@ namespace kurator { -namespace battles +namespace sim { @@ -27,5 +27,5 @@ private: }; -} // namespace battles +} // namespace sim } // namespace kurator diff --git a/sim/src/scenarios.cpp b/sim/src/scenarios.cpp index 34b4a24..65588bf 100644 --- a/sim/src/scenarios.cpp +++ b/sim/src/scenarios.cpp @@ -1,11 +1,11 @@ -#include +#include -#include +#include namespace kurator { -namespace battles +namespace sim { namespace scenarios { @@ -39,5 +39,5 @@ example() } // namespace scenarios -} // namespace battles +} // namespace sim } // namespace kurator -- cgit v1.1