refact(archive): expect correct mode for <</>> operators

EdgeFortress · Oct 8, 2019 · 6fa30d9 · 6fa30d9
1 parent cfd4950
commit 6fa30d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/SharedLibrary/Sources/Shared/Network/Archive.h b/SharedLibrary/Sources/Shared/Network/Archive.h
@@ -30,7 +30,9 @@ class Archive : public ICopyable {
 	template<class T>
 	Archive &operator&(T &ser) {
 		if constexpr (std::is_base_of_v<ISerializable, T>) {
-			sf::Int32 id; *this >> id; // we know type, so drop excess id
+			if (mode == Mode::Output) {
+				sf::Int32 id; *this >> id; // we know type, so drop excess id
+			}
 			reinterpret_cast<uf::ISerializable&>(ser).Serialize(*this);
 		} else {
 			serializeSimple(ser);
@@ -41,14 +43,14 @@ class Archive : public ICopyable {
 
 	template<class T>
 	Archive &operator>>(T &ser) {
-		if (mode == Mode::Output) *this & ser;
-		return *this;
+		EXPECT(mode == Mode::Output);
+		return *this & ser;
 	}
 
 	template<class T>
 	Archive &operator<<(const T &ser) {
-		if (mode == Mode::Input) *this & const_cast<T&>(ser);
-		return *this;
+		EXPECT(mode == Mode::Input);
+		return *this & const_cast<T&>(ser);
 	}
 
 protected:

diff --git a/SharedLibrary/Sources/Shared/Network/ISerializable.cpp b/SharedLibrary/Sources/Shared/Network/ISerializable.cpp
@@ -14,7 +14,8 @@ using namespace network::protocol;
 namespace uf {
 
 void ISerializable::Serialize(Archive &archive) {
-	archive << sf::Int32(SerID());
+	if (archive.GetMode() == Archive::Mode::Input)
+		archive << sf::Int32(SerID());
 }
 
 #define DECLARE_SER(name) \