Move stream operator declarations into the same file as their types

src/damage.hpp

@@ -116,7 +116,14 @@ inline bool isDead(eMainStatus stat) {
 
 std::ostream& operator << (std::ostream& out, eStatus e);
 std::istream& operator >> (std::istream& in, eStatus& e);
+std::istream& operator >> (std::istream& in, ePartyStatus& type);
+std::ostream& operator << (std::ostream& out, ePartyStatus type);
+std::ostream& operator << (std::ostream& out, eMainStatus e);
+std::istream& operator >> (std::istream& in, eMainStatus& e);
 std::ostream& operator << (std::ostream& out, eDamageType e);
 std::istream& operator >> (std::istream& in, eDamageType& e);
 
+void operator += (eMainStatus& stat, eMainStatus othr);
+void operator -= (eMainStatus& stat, eMainStatus othr);
+
 #endif

src/scenario/item.hpp

@@ -61,15 +61,6 @@ public:
 	void readFrom(std::istream& sin);
 };
 
-std::ostream& operator << (std::ostream& out, eItemType e);
-std::ostream& operator << (std::ostream& out, eItemAbil e);
-std::istream& operator >> (std::istream& in, eItemType& e);
-std::istream& operator >> (std::istream& in, eItemAbil& e);
-std::ostream& operator << (std::ostream& out, eSkill e);
-std::istream& operator >> (std::istream& in, eSkill& e);
-std::ostream& operator << (std::ostream& out, eItemUse e);
-std::istream& operator >> (std::istream& in, eItemUse& e);
-
 class cSpecItem {
 public:
 	short flags = 0;

src/scenario/item_abilities.hpp

@@ -111,4 +111,7 @@ inline eItemAbilCat getItemAbilCategory(eItemAbil abil) {
 	return eItemAbilCat::INVALID;
 }
 
+std::ostream& operator << (std::ostream& out, eItemAbil e);
+std::istream& operator >> (std::istream& in, eItemAbil& e);
+
 #endif

src/scenario/item_variety.hpp

@@ -62,4 +62,9 @@ enum class eItemUse {HELP_ONE, HARM_ONE, HELP_ALL, HARM_ALL};
 
 enum class eEnchant {PLUS_ONE, PLUS_TWO, PLUS_THREE, SHOOT_FLAME, FLAMING, PLUS_FIVE, BLESSED};
 
+std::ostream& operator << (std::ostream& out, eItemUse e);
+std::istream& operator >> (std::istream& in, eItemUse& e);
+std::ostream& operator << (std::ostream& out, eItemType e);
+std::istream& operator >> (std::istream& in, eItemType& e);
+
 #endif

src/scenario/quest.hpp

@@ -22,4 +22,7 @@ public:
 	std::string descr;
 };
 
+std::istream& operator>>(std::istream& in, eQuestStatus& type);
+std::ostream& operator<<(std::ostream& out, eQuestStatus type);
+
 #endif

src/scenario/terrain.hpp

@@ -49,13 +49,4 @@ public:
 	void writeTo(std::ostream& file) const;
 };
 
-std::ostream& operator << (std::ostream& out, eTerSpec e);
-std::istream& operator >> (std::istream& in, eTerSpec& e);
-std::ostream& operator << (std::ostream& out, eTrimType e);
-std::istream& operator >> (std::istream& in, eTrimType& e);
-std::ostream& operator << (std::ostream& out, eTerObstruct e);
-std::istream& operator >> (std::istream& in, eTerObstruct& e);
-std::ostream& operator << (std::ostream& out, eStepSnd e);
-std::istream& operator >> (std::istream& in, eStepSnd& e);
-
 #endif

src/scenario/terrain_abilities.hpp

@@ -86,4 +86,13 @@ inline bool blocksMove(eTerObstruct block) {
 
 enum class eStepSnd {STEP, SQUISH, CRUNCH, NONE, SPLASH};
 
+std::ostream& operator << (std::ostream& out, eTerSpec e);
+std::istream& operator >> (std::istream& in, eTerSpec& e);
+std::ostream& operator << (std::ostream& out, eTrimType e);
+std::istream& operator >> (std::istream& in, eTrimType& e);
+std::ostream& operator << (std::ostream& out, eTerObstruct e);
+std::istream& operator >> (std::istream& in, eTerObstruct& e);
+std::ostream& operator << (std::ostream& out, eStepSnd e);
+std::istream& operator >> (std::istream& in, eStepSnd& e);
+
 #endif

src/skills_traits.hpp

@@ -60,4 +60,9 @@ enum class eTrait {
 	ANAMA = 16,
 };
 
+std::ostream& operator << (std::ostream& out, eSkill e);
+std::istream& operator >> (std::istream& in, eSkill& e);
+std::ostream& operator << (std::ostream& out, eTrait e);
+std::istream& operator >> (std::istream& in, eTrait& e);
+
 #endif

src/universe/party.hpp

@@ -236,9 +236,5 @@ bool operator==(const cParty::cEncNote& one, const cParty::cEncNote& two);
 
 std::istream& operator>>(std::istream& in, eEncNoteType& type);
 std::ostream& operator<<(std::ostream& out, eEncNoteType type);
-std::istream& operator>>(std::istream& in, ePartyStatus& type);
-std::ostream& operator<<(std::ostream& out, ePartyStatus type);
-std::istream& operator>>(std::istream& in, eQuestStatus& type);
-std::ostream& operator<<(std::ostream& out, eQuestStatus type);
 
 #endif

src/universe/pc.hpp

@@ -176,11 +176,4 @@ public:
 	cPlayer& operator=(cPlayer other) = delete;
 };
 
-void operator += (eMainStatus& stat, eMainStatus othr);
-void operator -= (eMainStatus& stat, eMainStatus othr);
-std::ostream& operator << (std::ostream& out, eMainStatus e);
-std::istream& operator >> (std::istream& in, eMainStatus& e);
-std::ostream& operator << (std::ostream& out, eTrait e);
-std::istream& operator >> (std::istream& in, eTrait& e);
-
 #endif