summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium42 <rubidium@openttd.org>2021-04-27 19:32:51 +0200
committerrubidium42 <rubidium42@users.noreply.github.com>2021-04-27 19:58:03 +0200
commit015e3b412ebe709e1596179e86fde364cf19f52a (patch)
tree424f1982ec553697b477bc72e14aa138f3d029da
parentb89dba7e4e60c3387f74690687174080bac911cb (diff)
downloadopenttd-015e3b412ebe709e1596179e86fde364cf19f52a.tar.xz
Cleanup: remove #ifdefs for compiling the old content server
-rw-r--r--src/network/core/tcp_content.cpp6
-rw-r--r--src/network/core/tcp_content.h2
-rw-r--r--src/network/core/tcp_content_type.h2
3 files changed, 0 insertions, 10 deletions
diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index 55319e430..488be5000 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 f927021f4..52cae1e0e 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 f4dbc0c6e..4dc20f46b 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 */