Remove effectset.h

Move the 2 declarations in that file to containers_fwd.h
edo9300 · Dec 24, 2023 · bcd078a · bcd078a
1 parent 48a4ecf
commit bcd078a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/card.h b/card.h
@@ -11,7 +11,6 @@
 #include "containers_fwd.h"
 #include "common.h"
 #include "lua_obj.h"
-#include "effectset.h"
 #include "duel.h"
 #include <set>
 #include <map>

diff --git a/containers_fwd.h b/containers_fwd.h
@@ -22,6 +22,10 @@ class effect;
 using effect_vector = std::vector<effect*>;
 using effect_container = std::multimap<uint32_t, effect*>;
 using effect_indexer = std::unordered_map<effect*, effect_container::iterator>;
+using effect_set = std::vector<effect*>;
+using effect_set_v = effect_set;
+
+bool effect_sort_id(const effect* e1, const effect* e2);
 
 struct chain;
 using chain_array = std::vector<chain>;

diff --git a/effectset.h b/effectset.h
diff --git a/field.h b/field.h
@@ -12,7 +12,6 @@
 #include "common.h"
 #include "card.h"
 #include "progressivebuffer.h"
-#include "effectset.h"
 #include <vector>
 #include <set>
 #include <map>