From 015e3b412ebe709e1596179e86fde364cf19f52a Mon Sep 17 00:00:00 2001
From: rubidium42 <rubidium@openttd.org>
Date: Tue, 27 Apr 2021 19:32:51 +0200
Subject: [PATCH] Cleanup: remove #ifdefs for compiling the old content server

---
 src/network/core/tcp_content.cpp    | 6 ------
 src/network/core/tcp_content.h      | 2 --
 src/network/core/tcp_content_type.h | 2 --
 3 files changed, 10 deletions(-)

diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index 55319e430d..488be50003 100644
--- a/src/network/core/tcp_content.cpp
+++ b/src/network/core/tcp_content.cpp
@@ -10,14 +10,12 @@
  */
 
 #include "../../stdafx.h"
-#ifndef OPENTTD_MSU
 #include "../../textfile_gui.h"
 #include "../../newgrf_config.h"
 #include "../../base_media_base.h"
 #include "../../ai/ai.hpp"
 #include "../../game/game.hpp"
 #include "../../fios.h"
-#endif /* OPENTTD_MSU */
 #include "tcp_content.h"
 
 #include "../../safeguards.h"
@@ -92,7 +90,6 @@ bool ContentInfo::IsValid() const
 	return this->state < ContentInfo::INVALID && this->type >= CONTENT_TYPE_BEGIN && this->type < CONTENT_TYPE_END;
 }
 
-#ifndef OPENTTD_MSU
 /**
  * Search a textfile file next to this file in the content list.
  * @param type The type of the textfile to search for.
@@ -139,7 +136,6 @@ const char *ContentInfo::GetTextfile(TextfileType type) const
 	if (tmp == nullptr) return nullptr;
 	return ::GetTextfile(type, GetContentInfoSubDir(this->type), tmp);
 }
-#endif /* OPENTTD_MSU */
 
 void NetworkContentSocketHandler::Close()
 {
@@ -236,7 +232,6 @@ bool NetworkContentSocketHandler::Receive_SERVER_INFO(Packet *p) { return this->
 bool NetworkContentSocketHandler::Receive_CLIENT_CONTENT(Packet *p) { return this->ReceiveInvalidPacket(PACKET_CONTENT_CLIENT_CONTENT); }
 bool NetworkContentSocketHandler::Receive_SERVER_CONTENT(Packet *p) { return this->ReceiveInvalidPacket(PACKET_CONTENT_SERVER_CONTENT); }
 
-#ifndef OPENTTD_MSU
 /**
  * Helper to get the subdirectory a #ContentInfo is located in.
  * @param type The type of content.
@@ -261,4 +256,3 @@ Subdirectory GetContentInfoSubDir(ContentType type)
 		case CONTENT_TYPE_HEIGHTMAP:    return HEIGHTMAP_DIR;
 	}
 }
-#endif /* OPENTTD_MSU */
diff --git a/src/network/core/tcp_content.h b/src/network/core/tcp_content.h
index f927021f4d..52cae1e0ed 100644
--- a/src/network/core/tcp_content.h
+++ b/src/network/core/tcp_content.h
@@ -129,8 +129,6 @@ public:
 	bool ReceivePackets();
 };
 
-#ifndef OPENTTD_MSU
 Subdirectory GetContentInfoSubDir(ContentType type);
-#endif /* OPENTTD_MSU */
 
 #endif /* NETWORK_CORE_TCP_CONTENT_H */
diff --git a/src/network/core/tcp_content_type.h b/src/network/core/tcp_content_type.h
index f4dbc0c6ee..4dc20f46bb 100644
--- a/src/network/core/tcp_content_type.h
+++ b/src/network/core/tcp_content_type.h
@@ -82,9 +82,7 @@ struct ContentInfo {
 	size_t Size() const;
 	bool IsSelected() const;
 	bool IsValid() const;
-#ifndef OPENTTD_MSU
 	const char *GetTextfile(TextfileType type) const;
-#endif /* OPENTTD_MSU */
 };
 
 #endif /* NETWORK_CORE_TCP_CONTENT_TYPE_H */