Fix compile errors from merge

src/game_playerother.h

@@ -29,8 +29,8 @@ class Game_PlayerOther : public Game_PlayerBase {
 
 		int GetOpacity() const override;
 
-		Drawable::Z_t GetScreenZ(bool apply_shift = false) const override {
-			return Game_Character::GetScreenZ(apply_shift) | (0xFFFEu << 16u) + id;
+		Drawable::Z_t GetScreenZ(int x_offset, int y_offset) const override {
+			return Game_Character::GetScreenZ(x_offset, y_offset) | (0xFFFEu << 16u) + id;
 		}
 
 		void UpdateNextMovementAction() override {
@@ -79,4 +79,4 @@ inline int Game_PlayerOther::GetOpacity() const {
 	return std::floor(opacity);
 }
 
-#endif
+#endif

src/multiplayer/packet.h

@@ -57,30 +57,32 @@ class C2SPacket : public Packet {
 	std::string m_name;
 };
 
-class S2CPacket : public Packet {
-public:
-	virtual ~S2CPacket() = default;
-
+namespace S2CPacket__detail {
 	template<typename T>
-	static T Decode(std::string_view s);
+	T Decode(std::string_view s);
 
 	template<>
-	int Decode(std::string_view s) {
+	inline int Decode<int>(std::string_view s) {
 		int r;
 		auto e = std::from_chars(s.data(), s.data() + s.size(), r);
-		//if (e.ec != std::errc())
-		//	std::terminate();
 		return r;
 	}
 
 	template<>
-	bool Decode(std::string_view s) {
-		if (s == "1")
-			return true;
-		//if (s == "0")
-			return false;
-		//std::terminate();
+	inline bool Decode<bool>(std::string_view s) {
+		return s == "1";
 	}
+}
+
+class S2CPacket : public Packet {
+public:
+	virtual ~S2CPacket() = default;
+
+	template<typename T>
+	static T Decode(std::string_view s) {
+		return S2CPacket__detail::Decode<T>(s);
+	}
+
 };
 
 }