This switch has been a pain for years. Often disabling broke compilation, as no developer compiles OpenTTD without, neither do any of our official binaries. Additionaly, it has grown so hugely in our codebase, that it clearly shows that the current solution was a poor one. 350+ instances of "#ifdef ENABLE_NETWORK" were in the code, of which only ~30 in the networking code itself. The rest were all around the code to do the right thing, from GUI to NewGRF. A more proper solution would be to stub all the functions, and make sure the rest of the code can simply assume network is available. This was also partially done, and most variables were correct if networking was disabled. Despite that, often the #ifdefs were still used. With the recent removal of DOS, there is also no platform anymore which we support where networking isn't working out-of-the-box. All in all, it is time to remove the ENABLE_NETWORK switch. No replacement is planned, but if you feel we really need this option, we welcome any Pull Request which implements this in a way that doesn't crawl through the code like this diff shows we used to.
44 lines
1.9 KiB
C
44 lines
1.9 KiB
C
/* $Id$ */
|
|
|
|
/*
|
|
* This file is part of OpenTTD.
|
|
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
|
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/** @file network_gui.h GUIs related to networking. */
|
|
|
|
#ifndef NETWORK_GUI_H
|
|
#define NETWORK_GUI_H
|
|
|
|
#include "../company_type.h"
|
|
#include "../economy_type.h"
|
|
#include "../window_type.h"
|
|
#include "network_type.h"
|
|
|
|
void ShowNetworkNeedPassword(NetworkPasswordType npt);
|
|
void ShowNetworkGiveMoneyWindow(CompanyID company);
|
|
void ShowNetworkChatQueryWindow(DestType type, int dest);
|
|
void ShowJoinStatusWindow();
|
|
void ShowNetworkGameWindow();
|
|
void ShowClientList();
|
|
void ShowNetworkCompanyPasswordWindow(Window *parent);
|
|
|
|
|
|
/** Company information stored at the client side */
|
|
struct NetworkCompanyInfo : NetworkCompanyStats {
|
|
char company_name[NETWORK_COMPANY_NAME_LENGTH]; ///< Company name
|
|
Year inaugurated_year; ///< What year the company started in
|
|
Money company_value; ///< The company value
|
|
Money money; ///< The amount of money the company has
|
|
Money income; ///< How much did the company earned last year
|
|
uint16 performance; ///< What was his performance last month?
|
|
bool use_password; ///< Is there a password
|
|
char clients[NETWORK_CLIENTS_LENGTH]; ///< The clients that control this company (Name1, name2, ..)
|
|
};
|
|
|
|
NetworkCompanyInfo *GetLobbyCompanyInfo(CompanyID company);
|
|
|
|
#endif /* NETWORK_GUI_H */
|