mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Cleanup: remove #ifdefs for compiling the old content server

pull/9114/head
rubidium42 2021-04-27 19:32:51 +02:00 committed by rubidium42
parent b89dba7e4e
commit 015e3b412e
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/core/tcp_content.cpp
View File

@ -10,14 +10,12 @@
*/ */
#include "../../stdafx.h" #include "../../stdafx.h"
#ifndef OPENTTD_MSU
#include "../../textfile_gui.h" #include "../../textfile_gui.h"
#include "../../newgrf_config.h" #include "../../newgrf_config.h"
#include "../../base_media_base.h" #include "../../base_media_base.h"
#include "../../ai/ai.hpp" #include "../../ai/ai.hpp"
#include "../../game/game.hpp" #include "../../game/game.hpp"
#include "../../fios.h" #include "../../fios.h"
#endif /* OPENTTD_MSU */
#include "tcp_content.h" #include "tcp_content.h"
#include "../../safeguards.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; 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. * Search a textfile file next to this file in the content list.
* @param type The type of the textfile to search for. * @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; if (tmp == nullptr) return nullptr;
return ::GetTextfile(type, GetContentInfoSubDir(this->type), tmp); return ::GetTextfile(type, GetContentInfoSubDir(this->type), tmp);
} }
#endif /* OPENTTD_MSU */
void NetworkContentSocketHandler::Close() 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_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); } 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. * Helper to get the subdirectory a #ContentInfo is located in.
* @param type The type of content. * @param type The type of content.
@ -261,4 +256,3 @@ Subdirectory GetContentInfoSubDir(ContentType type)
case CONTENT_TYPE_HEIGHTMAP: return HEIGHTMAP_DIR; case CONTENT_TYPE_HEIGHTMAP: return HEIGHTMAP_DIR;
} }
} }
#endif /* OPENTTD_MSU */

2
src/network/core/tcp_content.h
View File

@ -129,8 +129,6 @@ public:
bool ReceivePackets(); bool ReceivePackets();
}; };
#ifndef OPENTTD_MSU
Subdirectory GetContentInfoSubDir(ContentType type); Subdirectory GetContentInfoSubDir(ContentType type);
#endif /* OPENTTD_MSU */
#endif /* NETWORK_CORE_TCP_CONTENT_H */ #endif /* NETWORK_CORE_TCP_CONTENT_H */

2
src/network/core/tcp_content_type.h
View File

@ -82,9 +82,7 @@ struct ContentInfo {
size_t Size() const; size_t Size() const;
bool IsSelected() const; bool IsSelected() const;
bool IsValid() const; bool IsValid() const;
#ifndef OPENTTD_MSU
const char *GetTextfile(TextfileType type) const; const char *GetTextfile(TextfileType type) const;
#endif /* OPENTTD_MSU */
}; };
#endif /* NETWORK_CORE_TCP_CONTENT_TYPE_H */ #endif /* NETWORK_CORE_TCP_CONTENT_TYPE_H */