cpp/openttd-patchpack/source Changeset - r23483:3733e6b8ff17

Changeset - r23483:3733e6b8ff17

Parent rev.

Child rev.

[Not reviewed]

master

! ! !

Patric Stout - 5 years ago 2019-03-20 16:01:13
truebrain@openttd.org

Remove: ENABLE_NETWORK switch

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.

96 files changed with 30 insertions and 601 deletions:

Doxyfile

config.lib

src/ai/ai.hpp

src/ai/ai_core.cpp

src/ai/ai_gui.cpp

src/base_media_func.h

src/bootstrap_gui.cpp

src/command.cpp

src/command_func.h

src/company_cmd.cpp

src/company_gui.cpp

src/console.cpp

src/console_cmds.cpp

src/date.cpp

src/debug.cpp

src/dedicated.cpp

src/economy.cpp

src/fileio.cpp

src/fios.cpp

src/fios_gui.cpp

src/game/game.hpp

src/game/game_core.cpp

src/gfx.cpp

src/goal.cpp

src/intro_gui.cpp

src/lang/english.txt

src/main_gui.cpp

src/misc.cpp

src/misc_cmd.cpp

src/network/core/address.cpp

src/network/core/address.h

src/network/core/core.cpp

src/network/core/core.h

src/network/core/game.h

src/network/core/host.cpp

src/network/core/os_abstraction.h

src/network/core/packet.cpp

src/network/core/packet.h

src/network/core/tcp.cpp

src/network/core/tcp.h

src/network/core/tcp_admin.cpp

src/network/core/tcp_admin.h

src/network/core/tcp_connect.cpp

src/network/core/tcp_content.cpp

src/network/core/tcp_content.h

src/network/core/tcp_game.cpp

src/network/core/tcp_game.h

src/network/core/tcp_http.cpp

src/network/core/tcp_http.h

src/network/core/tcp_listen.h

src/network/core/udp.cpp

src/network/core/udp.h

src/network/network.cpp

src/network/network.h

src/network/network_admin.cpp

src/network/network_admin.h

src/network/network_base.h

src/network/network_chat_gui.cpp

src/network/network_client.cpp

src/network/network_client.h

src/network/network_command.cpp

src/network/network_content.cpp

src/network/network_content.h

src/network/network_content_gui.cpp

src/network/network_func.h

src/network/network_gamelist.cpp

src/network/network_gui.cpp

src/network/network_gui.h

src/network/network_internal.h

src/network/network_server.cpp

src/network/network_server.h

src/network/network_type.h

src/network/network_udp.cpp

src/network/network_udp.h

src/newgrf_config.cpp

src/newgrf_config.h

src/newgrf_gui.cpp

src/openttd.cpp

src/order_backup.cpp

src/script/api/script_admin.cpp

src/script/api/script_client.cpp

src/script/api/script_clientlist.cpp

src/script/api/script_game.cpp

src/script/api/script_goal.cpp

src/script/api/script_object.cpp

src/script/script_scanner.cpp

src/settings.cpp

src/settings_func.h

src/settings_type.h

src/strings.cpp

src/table/gameopt_settings.ini

src/table/settings.ini

src/toolbar_gui.cpp

src/video/dedicated_v.cpp

src/viewport.cpp

src/window.cpp

0 comments (0 inline, 0 general)

Doxyfile

➞

Show inline comments

@@ @@ -289,8 +289,7 @@ EXPAND_ONLY_PREDEF = YES @@
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = ENABLE_NETWORK \
                          WITH_ZLIB \
 PREDEFINED             = WITH_ZLIB \
                          WITH_LZO \
                          WITH_LIBLZMA \
                          WITH_SDL \

config.lib

➞

Show inline comments

@@ @@ -52,7 +52,6 @@ set_default() { @@
 	enable_profiling="0"
 	enable_lto="0"
 	enable_dedicated="0"
 	enable_network="1"
 	enable_static="1"
 	enable_translator="0"
 	enable_unicode="1"
@@ @@ -130,7 +129,6 @@ set_default() { @@
 		enable_profiling
 		enable_lto
 		enable_dedicated
 		enable_network
 		enable_static
 		enable_translator
 		enable_unicode
@@ @@ -289,9 +287,6 @@ detect_params() { @@
 			--enable-ipo=*)               enable_lto="$optarg";;
 			--enable-dedicated)           enable_dedicated="1";;
 			--enable-dedicated=*)         enable_dedicated="$optarg";;
 			--enable-network)             enable_network="2";;
 			--enable-network=*)           enable_network="$optarg";;
 			--disable-network)            enable_network="0";;
 			--disable-static)             enable_static="0";;
 			--enable-static)              enable_static="2";;
 			--enable-static=*)            enable_static="$optarg";;
@@ @@ -749,11 +744,6 @@ check_params() { @@
 	if [ "$enable_dedicated" != "0" ]; then
 		log 1 "checking GDI video driver... dedicated server, skipping"
 		log 1 "checking dedicated... found"
 		if [ "$enable_network" = "0" ]; then
 			log 1 "configure: error: building a dedicated server without network support is pointless"
 			exit 1
 		fi
 	else
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 			log 1 "checking GDI video driver... found"
@@ @@ -784,12 +774,6 @@ check_params() { @@
 		log 1 "checking console application... enabled"
 	fi
     if [ "$enable_network" != "0" ]; then
 		log 1 "checking network... found"
 	else
 		log 1 "checking network... disabled"
 	fi
 	log 1 "checking squirrel... found"
 	SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include"
@@ @@ -1833,16 +1817,12 @@ make_cflags_and_ldflags() { @@
 		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
 	fi
 	if [ "$enable_network" != "0" ]; then
 		CFLAGS="$CFLAGS -DENABLE_NETWORK"
 		if [ "$os" = "HAIKU" ]; then
 			LDFLAGS="$LDFLAGS -lnetwork"
 		fi
 		if [ "$os" = "SUNOS" ]; then
 			LDFLAGS="$LDFLAGS -lnsl -lsocket"
 		fi
 	if [ "$os" = "HAIKU" ]; then
 		LDFLAGS="$LDFLAGS -lnetwork"
 	fi
 	if [ "$os" = "SUNOS" ]; then
 		LDFLAGS="$LDFLAGS -lnsl -lsocket"
 	fi
 	if [ "$enable_static" != "0" ]; then
@@ @@ -3499,7 +3479,6 @@ showhelp() { @@
 	echo "  --enable-console               compile as a console application instead of as a GUI application."
 	echo "                                 If this setting is active, debug output will appear in the same"
 	echo "                                 console instead of opening a new window. (Win32 ONLY)"
 	echo "  --disable-network              disable network support"
 	echo "  --disable-assert               disable asserts (continue on errors)"
 	echo "  --enable-strip                 enable any possible stripping"
 	echo "  --without-osx-sysroot          disable the automatic adding of sysroot "

src/ai/ai.hpp

➞

Show inline comments

@@ @@ -164,11 +164,9 @@ public: @@
 	/** Gets the ScriptScanner instance that is used to find AI Libraries */
 	static AIScannerLibrary *GetScannerLibrary();
 #if defined(ENABLE_NETWORK)
 	/** Wrapper function for AIScanner::HasAI */
 	static bool HasAI(const struct ContentInfo *ci, bool md5sum);
 	static bool HasAILibrary(const ContentInfo *ci, bool md5sum);
 #endif
 private:
 	static uint frame_counter;                      ///< Tick counter for the AI code
 	static class AIScannerInfo *scanner_info;       ///< ScriptScanner instance that is used to find AIs

src/ai/ai_core.cpp

➞

Show inline comments

@@ @@ -362,8 +362,6 @@ @@
 	InvalidateWindowClassesData(WC_AI_SETTINGS);
+}
 #if defined(ENABLE_NETWORK)
 /**
  * Check whether we have an AI (library) with the exact characteristics as ci.
  * @param ci the characteristics to search on (shortname and md5sum)
@@ @@ -380,8 +378,6 @@ @@
 	return AI::scanner_library->HasScript(ci, md5sum);
+}
 #endif /* defined(ENABLE_NETWORK) */
 /* static */ AIScannerInfo *AI::GetScannerInfo()
+{
 	return AI::scanner_info;

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -928,9 +928,7 @@ struct AIConfigWindow : public Window { @@
 				if (!_network_available) {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 #if defined(ENABLE_NETWORK)
 					ShowNetworkContentListWindow(NULL, CONTENT_TYPE_AI, CONTENT_TYPE_GAME);
 #endif
+				}
 				break;
+		}

src/base_media_func.h

➞

Show inline comments

@@ @@ -277,7 +277,6 @@ template <class Tbase_set> @@
 	return p;
+}
 #if defined(ENABLE_NETWORK)
 #include "network/network_content.h"
 template <class Tbase_set> const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s)
@@ @@ -307,22 +306,6 @@ template <class Tbase_set> @@
 			(TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::duplicate_sets) != NULL);
+}
 #else
 template <class Tbase_set>
 const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s)
+{
 	return NULL;
+}
 template <class Tbase_set>
 /* static */ bool BaseMedia<Tbase_set>::HasSet(const ContentInfo *ci, bool md5sum)
+{
 	return false;
+}
 #endif /* ENABLE_NETWORK */
 /**
  * Count the number of available graphics sets.
  * @return the number of sets

src/bootstrap_gui.cpp

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ @@
 #include "base_media_base.h"
 #include "blitter/factory.hpp"
-#if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE)
 #if defined(WITH_FREETYPE)
 #include "core/geometry_func.hpp"
 #include "fontcache.h"
@@ @@ -204,7 +204,7 @@ public: @@
+	}
 };
-#endif /* defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) */
 #endif /* defined(WITH_FREETYPE) */
 /**
  * Handle all procedures for bootstrapping OpenTTD without a base graphics set.
@@ @@ -220,7 +220,7 @@ bool HandleBootstrap() @@
 	if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) goto failure;
 	/* If there is no network or no freetype, then there is nothing we can do. Go straight to failure. */
-#if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(_WIN32) || defined(__APPLE__))
 #if defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(_WIN32) || defined(__APPLE__))
 	if (!_network_available) goto failure;
 	/* First tell the game we're bootstrapping. */

src/command.cpp

➞

Show inline comments

@@ @@ -573,10 +573,8 @@ bool DoCommandP(TileIndex tile, uint32 p @@
 		return false;
+	}
 #ifdef ENABLE_NETWORK
 	/* Only set p2 when the command does not come from the network. */
 	if (!(cmd & CMD_NETWORK_COMMAND) && GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = CLIENT_ID_SERVER;
 #endif
 	CommandCost res = DoCommandPInternal(tile, p1, p2, cmd, callback, text, my_cmd, estimate_only);
 	if (res.Failed()) {
@@ @@ -646,10 +644,8 @@ CommandCost DoCommandPInternal(TileIndex @@
 	/* Flags get send to the DoCommand */
 	DoCommandFlag flags = CommandFlagsToDCFlags(cmd_flags);
 #ifdef ENABLE_NETWORK
 	/* Make sure p2 is properly set to a ClientID. */
 	assert(!(cmd_flags & CMD_CLIENT_ID) || p2 != 0);
 #endif
 	/* Do not even think about executing out-of-bounds tile-commands */
 	if (tile != 0 && (tile >= MapSize() || (!IsValidTile(tile) && (cmd_flags & CMD_ALL_TILES) == 0))) return_dcpi(CMD_ERROR);
@@ @@ -696,7 +692,6 @@ CommandCost DoCommandPInternal(TileIndex @@
 		return_dcpi(res);
+	}
 #ifdef ENABLE_NETWORK
 	/*
 	 * If we are in network, and the command is not from the network
 	 * send it to the command-queue and abort execution
@@ @@ -711,7 +706,6 @@ CommandCost DoCommandPInternal(TileIndex @@
 		 * reset the storages as we've not executed the command. */
 		return_dcpi(CommandCost());
+	}
 #endif /* ENABLE_NETWORK */
 	DEBUG(desync, 1, "cmd: %08x; %02x; %02x; %06x; %08x; %08x; %08x; \"%s\" (%s)", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text, GetCommandName(cmd));
 	/* Actually try and execute the command. If no cost-type is given

src/command_func.h

➞

Show inline comments

@@ @@ -42,9 +42,7 @@ bool DoCommandP(const CommandContainer * @@
 CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback, const char *text, bool my_cmd, bool estimate_only);
 #ifdef ENABLE_NETWORK
 void NetworkSendCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback, const char *text, CompanyID company);
 #endif /* ENABLE_NETWORK */
 extern Money _additional_cash_required;

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -104,10 +104,8 @@ void SetLocalCompany(CompanyID new_compa @@
 	/* company could also be COMPANY_SPECTATOR or OWNER_NONE */
 	assert(Company::IsValidID(new_company) || new_company == COMPANY_SPECTATOR || new_company == OWNER_NONE);
 #ifdef ENABLE_NETWORK
 	/* Delete the chat window, if you were team chatting. */
 	InvalidateWindowData(WC_SEND_NETWORK_MSG, DESTTYPE_TEAM, _local_company);
 #endif
 	assert(IsLocalCompany());
@@ @@ -597,9 +595,7 @@ void StartupCompanies() @@
 /** Start a new competitor company if possible. */
 static bool MaybeStartNewCompany()
+{
 #ifdef ENABLE_NETWORK
 	if (_networking && Company::GetNumItems() >= _settings_client.network.max_companies) return false;
 #endif /* ENABLE_NETWORK */
 	Company *c;
@@ @@ -792,9 +788,7 @@ void CompanyNewsInformation::FillData(co @@
  */
 void CompanyAdminUpdate(const Company *company)
+{
 #ifdef ENABLE_NETWORK
 	if (_network_server) NetworkAdminCompanyUpdate(company);
 #endif /* ENABLE_NETWORK */
+}
 /**
@@ @@ -804,9 +798,7 @@ void CompanyAdminUpdate(const Company *c @@
  */
 void CompanyAdminRemove(CompanyID company_id, CompanyRemoveReason reason)
+{
 #ifdef ENABLE_NETWORK
 	if (_network_server) NetworkAdminCompanyRemove(company_id, (AdminCompanyRemoveReason)reason);
 #endif /* ENABLE_NETWORK */
+}
 /**
@@ @@ -832,7 +824,6 @@ CommandCost CmdCompanyCtrl(TileIndex til @@
 			/* This command is only executed in a multiplayer game */
 			if (!_networking) return CMD_ERROR;
 #ifdef ENABLE_NETWORK
 			/* Has the network client a correct ClientIndex? */
 			if (!(flags & DC_EXEC)) return CommandCost();
@@ @@ -876,7 +867,6 @@ CommandCost CmdCompanyCtrl(TileIndex til @@
+			}
 			NetworkServerNewCompany(c, ci);
 #endif /* ENABLE_NETWORK */
 			break;
+		}
@@ @@ -885,9 +875,7 @@ CommandCost CmdCompanyCtrl(TileIndex til @@
 			if (company_id != INVALID_COMPANY && (company_id >= MAX_COMPANIES || Company::IsValidID(company_id))) return CMD_ERROR;
 			Company *c = DoStartupNewCompany(true, company_id);
 #ifdef ENABLE_NETWORK
 			if (c != NULL) NetworkServerNewCompany(c, NULL);
 #endif /* ENABLE_NETWORK */
 			break;
+		}

src/company_gui.cpp

➞

Show inline comments

@@ @@ -2387,11 +2387,9 @@ struct CompanyWindow : Window @@
 				break;
+			}
 #ifdef ENABLE_NETWORK
 			case WID_C_HAS_PASSWORD:
 				*size = maxdim(*size, GetSpriteSize(SPR_LOCK));
 				break;
 #endif /* ENABLE_NETWORK */
+		}
+	}
@@ @@ -2498,13 +2496,11 @@ struct CompanyWindow : Window @@
 				break;
+			}
 #ifdef ENABLE_NETWORK
 			case WID_C_HAS_PASSWORD:
 				if (_networking && NetworkCompanyIsPassworded(c->index)) {
 					DrawSprite(SPR_LOCK, PAL_NONE, r.left, r.top);
+				}
 				break;
 #endif /* ENABLE_NETWORK */
+		}
+	}
@@ @@ -2594,7 +2590,6 @@ struct CompanyWindow : Window @@
 				DoCommandP(0, this->window_number, 0, CMD_SELL_SHARE_IN_COMPANY | CMD_MSG(STR_ERROR_CAN_T_SELL_25_SHARE_IN));
 				break;
 #ifdef ENABLE_NETWORK
 			case WID_C_COMPANY_PASSWORD:
 				if (this->window_number == _local_company) ShowNetworkCompanyPasswordWindow(this);
 				break;
@@ @@ -2614,7 +2609,6 @@ struct CompanyWindow : Window @@
+				}
 				break;
+			}
 #endif /* ENABLE_NETWORK */
+		}
+	}
@@ @@ -2652,11 +2646,9 @@ struct CompanyWindow : Window @@
 				DoCommandP(0, 0, 0, CMD_RENAME_COMPANY | CMD_MSG(STR_ERROR_CAN_T_CHANGE_COMPANY_NAME), NULL, str);
 				break;
 #ifdef ENABLE_NETWORK
 			case WID_C_COMPANY_JOIN:
 				NetworkClientRequestMove((CompanyID)this->window_number, str);
 				break;
 #endif /* ENABLE_NETWORK */
+		}
+	}

src/console.cpp

➞

Show inline comments

@@ @@ -33,10 +33,8 @@ FILE *_iconsole_output_file; @@
 void IConsoleInit()
+{
 	_iconsole_output_file = NULL;
 #ifdef ENABLE_NETWORK /* Initialize network only variables */
 	_redirect_console_to_client = INVALID_CLIENT_ID;
 	_redirect_console_to_admin  = INVALID_ADMIN_ID;
 #endif
 	IConsoleGUIInit();
@@ @@ -90,7 +88,6 @@ void IConsolePrint(TextColour colour_cod @@
 	assert(IsValidConsoleColour(colour_code));
 	char *str;
 #ifdef ENABLE_NETWORK
 	if (_redirect_console_to_client != INVALID_CLIENT_ID) {
 		/* Redirect the string to the client */
 		NetworkServerSendRcon(_redirect_console_to_client, colour_code, string);
@@ @@ -101,7 +98,6 @@ void IConsolePrint(TextColour colour_cod @@
 		NetworkServerSendAdminRcon(_redirect_console_to_admin, colour_code, string);
 		return;
+	}
 #endif
 	/* Create a copy of the string, strip if of colours and invalid
 	 * characters and (when applicable) assign it to the console buffer */
@@ @@ -110,9 +106,7 @@ void IConsolePrint(TextColour colour_cod @@
 	str_validate(str, str + strlen(str));
 	if (_network_dedicated) {
 #ifdef ENABLE_NETWORK
 		NetworkAdminConsole("console", str);
 #endif /* ENABLE_NETWORK */
 		fprintf(stdout, "%s%s\n", GetLogPrefix(), str);
 		fflush(stdout);
 		IConsoleWriteToLogFile(str);

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -86,8 +86,6 @@ static ConsoleFileList _console_file_lis @@
  * command hooks
  ****************/
 #ifdef ENABLE_NETWORK
 /**
  * Check network availability and inform in console about failure of detection.
  * @return Network availability.
@@ @@ -159,10 +157,6 @@ DEF_CONSOLE_HOOK(ConHookNoNetwork) @@
 	return CHR_ALLOW;
+}
 #else
 #	define ConHookNoNetwork NULL
 #endif /* ENABLE_NETWORK */
 DEF_CONSOLE_HOOK(ConHookNewGRFDeveloperTool)
+{
 	if (_settings_client.gui.newgrf_developer_tools) {
@@ @@ -170,11 +164,7 @@ DEF_CONSOLE_HOOK(ConHookNewGRFDeveloperT @@
 			if (echo) IConsoleError("This command is only available in game and editor.");
 			return CHR_DISALLOW;
+		}
 #ifdef ENABLE_NETWORK
 		return ConHookNoNetwork(echo);
 #else
 		return CHR_ALLOW;
 #endif
+	}
 	return CHR_HIDE;
+}
@@ @@ -479,7 +469,6 @@ DEF_CONSOLE_CMD(ConClearBuffer) @@
 /**********************************
  * Network Core Console Commands
  **********************************/
 #ifdef ENABLE_NETWORK
 static bool ConKickOrBan(const char *argv, bool ban)
+{
@@ @@ -930,8 +919,6 @@ DEF_CONSOLE_CMD(ConNetworkConnect) @@
 	return true;
+}
 #endif /* ENABLE_NETWORK */
 /*********************************
  *  script file console commands
  *********************************/
@@ @@ -1547,12 +1534,9 @@ DEF_CONSOLE_CMD(ConCompanies) @@
 		const char *password_state = "";
 		if (c->is_ai) {
 			password_state = "AI";
+		}
 #ifdef ENABLE_NETWORK
 		else if (_network_server) {
 		} else if (_network_server) {
 				password_state = StrEmpty(_network_company_states[c->index].password) ? "unprotected" : "protected";
+		}
 #endif
 		char colour[512];
 		GetString(colour, STR_COLOUR_DARK_BLUE + _company_colours[c->index], lastof(colour));
@@ @@ -1569,8 +1553,6 @@ DEF_CONSOLE_CMD(ConCompanies) @@
 	return true;
+}
 #ifdef ENABLE_NETWORK
 DEF_CONSOLE_CMD(ConSay)
+{
 	if (argc == 0) {
@@ @@ -1812,7 +1794,6 @@ DEF_CONSOLE_CMD(ConContent) @@
 	return false;
+}
 #endif /* defined(WITH_ZLIB) */
 #endif /* ENABLE_NETWORK */
 DEF_CONSOLE_CMD(ConSetting)
+{
@@ @@ -1992,7 +1973,7 @@ void IConsoleStdLibRegister() @@
 	IConsoleAliasRegister("players",       "companies");
 	/* networking functions */
-#ifdef ENABLE_NETWORK
 /* Content downloading is only available with ZLIB */
 #if defined(WITH_ZLIB)
 	IConsoleCmdRegister("content",         ConContent);
@@ @@ -2050,7 +2031,6 @@ void IConsoleStdLibRegister() @@
 	IConsoleAliasRegister("restart_game_year",     "setting restart_game_year %+");
 	IConsoleAliasRegister("min_players",           "setting min_active_clients %+");
 	IConsoleAliasRegister("reload_cfg",            "setting reload_cfg %+");
 #endif /* ENABLE_NETWORK */
 	/* debugging stuff */
 #ifdef _DEBUG

src/date.cpp

➞

Show inline comments

@@ @@ -195,9 +195,7 @@ static void OnNewYear() @@
 	VehiclesYearlyLoop();
 	TownsYearlyLoop();
 	InvalidateWindowClassesData(WC_BUILD_STATION);
 #ifdef ENABLE_NETWORK
 	if (_network_server) NetworkServerYearlyLoop();
 #endif /* ENABLE_NETWORK */
 	if (_cur_year == _settings_client.gui.semaphore_build_before) ResetSignalVariant();
@@ @@ -217,11 +215,9 @@ static void OnNewYear() @@
 		LinkGraph *lg;
 		FOR_ALL_LINK_GRAPHS(lg) lg->ShiftDates(-days_this_year);
 #ifdef ENABLE_NETWORK
 		/* Because the _date wraps here, and text-messages expire by game-days, we have to clean out
 		 *  all of them if the date is set back, else those messages will hang for ever */
 		NetworkInitChatMessage();
 #endif /* ENABLE_NETWORK */
+	}
 	if (_settings_client.gui.auto_euro) CheckSwitchToEuro();
@@ @@ -244,9 +240,7 @@ static void OnNewMonth() @@
 	IndustryMonthlyLoop();
 	SubsidyMonthlyLoop();
 	StationMonthlyLoop();
 #ifdef ENABLE_NETWORK
 	if (_network_server) NetworkServerMonthlyLoop();
 #endif /* ENABLE_NETWORK */
+}
 /**
@@ @@ -254,9 +248,7 @@ static void OnNewMonth() @@
  */
 static void OnNewDay()
+{
 #ifdef ENABLE_NETWORK
 	if (_network_server) NetworkServerDailyLoop();
 #endif /* ENABLE_NETWORK */
 	DisasterDailyLoop();
 	IndustryDailyLoop();

src/debug.cpp

➞

Show inline comments

@@ @@ -23,10 +23,8 @@ @@
 #include <time.h>
 #if defined(ENABLE_NETWORK)
 #include "network/network_admin.h"
 SOCKET _debug_socket = INVALID_SOCKET;
 #endif /* ENABLE_NETWORK */
 #include "safeguards.h"
@@ @@ -111,7 +109,6 @@ char *DumpDebugFacilityNames(char *buf, @@
  */
 static void debug_print(const char *dbg, const char *buf)
+{
 #if defined(ENABLE_NETWORK)
 	if (_debug_socket != INVALID_SOCKET) {
 		char buf2[1024 + 32];
@@ @@ -121,7 +118,6 @@ static void debug_print(const char *dbg, @@
 		send(_debug_socket, buf2, (int)strlen(buf2), 0);
 		return;
+	}
 #endif /* ENABLE_NETWORK */
 	if (strcmp(dbg, "desync") == 0) {
 		static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
 		if (f == NULL) return;
@@ @@ -146,9 +142,7 @@ static void debug_print(const char *dbg, @@
 #else
 		fputs(buffer, stderr);
 #endif
 #ifdef ENABLE_NETWORK
 		NetworkAdminConsole(dbg, buf);
 #endif /* ENABLE_NETWORK */
 		IConsoleDebug(dbg, buf);
+	}
+}

src/dedicated.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
 #include "stdafx.h"
 #ifdef ENABLE_NETWORK
 char *_log_file = NULL; ///< File to reroute output of a forked OpenTTD to
 FILE *_log_fd   = NULL; ///< File to reroute output of a forked OpenTTD to
@@ @@ -67,10 +65,3 @@ void DedicatedFork() @@
+	}
+}
 #endif
 #else
 /** Empty helper function call for NOT(UNIX) systems */
 void DedicatedFork() {}
 #endif /* ENABLE_NETWORK */

src/economy.cpp

➞

Show inline comments

@@ @@ -292,10 +292,8 @@ void ChangeOwnershipOfCompanyItems(Owner @@
 	 * the client. This is needed as it needs to know whether "you" really
 	 * are the current local company. */
 	Backup<CompanyByte> cur_company(_current_company, old_owner, FILE_LINE);
 #ifdef ENABLE_NETWORK
 	/* In all cases, make spectators of clients connected to that company */
 	if (_networking) NetworkClientsToSpectators(old_owner);
 #endif /* ENABLE_NETWORK */
 	if (old_owner == _local_company) {
 		/* Single player cheated to AI company.
 		 * There are no spectators in single player, so we must pick some other company. */

src/fileio.cpp

➞

Show inline comments

@@ @@ -1240,7 +1240,6 @@ void DeterminePaths(const char *exe) @@
 	/* If we have network we make a directory for the autodownloading of content */
 	_searchpaths[SP_AUTODOWNLOAD_DIR] = str_fmt("%s%s", _personal_dir, "content_download" PATHSEP);
 #ifdef ENABLE_NETWORK
 	FioCreateDirectory(_searchpaths[SP_AUTODOWNLOAD_DIR]);
 	/* Create the directory for each of the types of content */
@@ @@ -1253,14 +1252,6 @@ void DeterminePaths(const char *exe) @@
 	extern char *_log_file;
 	_log_file = str_fmt("%sopenttd.log",  _personal_dir);
 #else /* ENABLE_NETWORK */
 	/* If we don't have networking, we don't need to make the directory. But
 	 * if it exists we keep it, otherwise remove it from the search paths. */
 	if (!FileExists(_searchpaths[SP_AUTODOWNLOAD_DIR]))  {
 		free(_searchpaths[SP_AUTODOWNLOAD_DIR]);
 		_searchpaths[SP_AUTODOWNLOAD_DIR] = NULL;
+	}
 #endif /* ENABLE_NETWORK */
+}
 /**

src/fios.cpp

➞

Show inline comments

@@ @@ -13,11 +13,13 @@ @@
  */
 #include "stdafx.h"
-#include "fios.h"
+#include "3rdparty/md5/md5.h"
 #include "fileio_func.h"
 #include "tar_type.h"
 #include "fios.h"
 #include "network/network_content.h"
 #include "screenshot.h"
 #include "string_func.h"
 #include "tar_type.h"
 #include <sys/stat.h>
 #ifndef _WIN32
@@ @@ -632,10 +634,6 @@ const char *FiosGetScreenshotDir() @@
 	return fios_screenshot_path;
+}
 #if defined(ENABLE_NETWORK)
 #include "network/network_content.h"
 #include "3rdparty/md5/md5.h"
 /** Basic data to distinguish a scenario. Used in the server list window */
 struct ScenarioIdentifier {
 	uint32 scenid;           ///< ID for the scenario (generated by content).
@@ @@ -754,5 +752,3 @@ void ScanScenarios() @@
+{
 	_scanner.Scan(true);
+}
 #endif /* ENABLE_NETWORK */

src/fios_gui.cpp

➞

Show inline comments

@@ @@ -634,9 +634,7 @@ public: @@
 				if (!_network_available) {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else if (_load_check_data.HasNewGrfs()) {
 #if defined(ENABLE_NETWORK)
 					ShowMissingContentWindow(_load_check_data.grfconfig);
 #endif
+				}
 				break;
@@ @@ -698,14 +696,12 @@ public: @@
 				if (!_network_available) {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 #if defined(ENABLE_NETWORK)
 					assert(this->fop == SLO_LOAD);
 					switch (this->abstract_filetype) {
 						default: NOT_REACHED();
 						case FT_SCENARIO:  ShowNetworkContentListWindow(NULL, CONTENT_TYPE_SCENARIO);  break;
 						case FT_HEIGHTMAP: ShowNetworkContentListWindow(NULL, CONTENT_TYPE_HEIGHTMAP); break;
+					}
 #endif
+				}
 				break;

src/game/game.hpp

➞

Show inline comments

@@ @@ -112,11 +112,9 @@ public: @@
 	 */
 	static class GameInstance *GetInstance() { return Game::instance; }
 #if defined(ENABLE_NETWORK)
 	/** Wrapper function for GameScanner::HasGame */
 	static bool HasGame(const struct ContentInfo *ci, bool md5sum);
 	static bool HasGameLibrary(const ContentInfo *ci, bool md5sum);
 #endif
 	/** Gets the ScriptScanner instance that is used to find Game scripts */
 	static GameScannerInfo *GetScannerInfo();
 	/** Gets the ScriptScanner instance that is used to find Game Libraries */

src/game/game_core.cpp

➞

Show inline comments

@@ @@ -257,8 +257,6 @@ @@
 	return Game::scanner_library->FindLibrary(library, version);
+}
 #if defined(ENABLE_NETWORK)
 /**
  * Check whether we have an Game (library) with the exact characteristics as ci.
  * @param ci the characteristics to search on (shortname and md5sum)
@@ @@ -275,8 +273,6 @@ @@
 	return Game::scanner_library->HasScript(ci, md5sum);
+}
 #endif /* defined(ENABLE_NETWORK) */
 /* static */ GameScannerInfo *Game::GetScannerInfo()
+{
 	return Game::scanner_info;

src/gfx.cpp

➞

Show inline comments

@@ @@ -86,9 +86,7 @@ void GfxScroll(int left, int top, int wi @@
 	if (_cursor.visible) UndrawMouseCursor();
 #ifdef ENABLE_NETWORK
 	if (_networking) NetworkUndrawChatMessage();
 #endif /* ENABLE_NETWORK */
 	blitter->ScrollBuffer(_screen.dst_ptr, left, top, width, height, xo, yo);
 	/* This part of the screen is now dirty. */
@@ @@ -1288,9 +1286,7 @@ void RedrawScreenRect(int left, int top, @@
+		}
+	}
 #ifdef ENABLE_NETWORK
 	if (_networking) NetworkUndrawChatMessage();
 #endif /* ENABLE_NETWORK */
 	DrawOverlappedWindowForAll(left, top, right, bottom);

src/goal.cpp

➞

Show inline comments

@@ @@ -247,20 +247,14 @@ CommandCost CmdGoalQuestion(TileIndex ti @@
+{
 	uint16 uniqueid = (GoalType)GB(p1, 0, 16);
 	CompanyID company = (CompanyID)GB(p1, 16, 8);
 #ifdef ENABLE_NETWORK
 	ClientIndex client = (ClientIndex)GB(p1, 16, 8);
 #endif
 	byte type = GB(p1, 24, 2);
 	bool is_client = HasBit(p1, 31);
 	if (_current_company != OWNER_DEITY) return CMD_ERROR;
 	if (StrEmpty(text)) return CMD_ERROR;
 	if (is_client) {
 #ifdef ENABLE_NETWORK
 		if (!NetworkClientInfo::IsValidID(client)) return CMD_ERROR;
 #else
 		return CMD_ERROR;
 #endif
 	} else {
 		if (company != INVALID_COMPANY && !Company::IsValidID(company)) return CMD_ERROR;
+	}
@@ @@ -270,9 +264,7 @@ CommandCost CmdGoalQuestion(TileIndex ti @@
 	if (flags & DC_EXEC) {
 		if (is_client) {
 #ifdef ENABLE_NETWORK
 			if (NetworkClientInfo::Get(client)->client_id != _network_own_client_id) return CommandCost();
 #endif
 		} else {
 			if (company == INVALID_COMPANY && !Company::IsValidID(_local_company)) return CommandCost();
 			if (company != INVALID_COMPANY && company != _local_company) return CommandCost();

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -113,11 +113,9 @@ struct SelectGameWindow : public Window @@
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
 #ifdef ENABLE_NETWORK
 		/* Do not create a network server when you (just) have closed one of the game
 		 * creation/load windows for the network server. */
 		if (IsInsideMM(widget, WID_SGI_GENERATE_GAME, WID_SGI_EDIT_SCENARIO + 1)) _is_network_server = false;
 #endif /* ENABLE_NETWORK */
 		switch (widget) {
 			case WID_SGI_GENERATE_GAME:

src/lang/english.txt

➞

Show inline comments

@@ @@ -2139,7 +2139,7 @@ STR_NETWORK_CHAT_ALL @@
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Enter text for network chat
 # Network messages
-STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}No network devices found or compiled without ENABLE_NETWORK
 STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}No network devices found
 STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Could not find any network games
 STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}The server didn't answer the request
 STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Could not connect due to NewGRF mismatch

src/main_gui.cpp

➞

Show inline comments

@@ @@ -53,7 +53,6 @@ static int _rename_what = -1; @@
 void CcGiveMoney(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+{
 #ifdef ENABLE_NETWORK
 	if (result.Failed() || !_settings_game.economy.give_money) return;
 	/* Inform the company of the action of one of its clients (controllers). */
@@ @@ -66,25 +65,22 @@ void CcGiveMoney(const CommandCost &resu @@
 	} else {
 		NetworkServerSendChat(NETWORK_ACTION_GIVE_MONEY, DESTTYPE_TEAM, p2, msg, CLIENT_ID_SERVER, p1);
+	}
 #endif /* ENABLE_NETWORK */
+}
 void HandleOnEditText(const char *str)
+{
 	switch (_rename_what) {
 #ifdef ENABLE_NETWORK
 	case 3: { // Give money, you can only give money in excess of loan
 		const Company *c = Company::GetIfValid(_local_company);
 		if (c == NULL) break;
 		Money money = min(c->money - c->current_loan, (Money)(atoi(str) / _currency->rate));
 		case 3: { // Give money, you can only give money in excess of loan
 			const Company *c = Company::GetIfValid(_local_company);
 			if (c == NULL) break;
 			Money money = min(c->money - c->current_loan, (Money)(atoi(str) / _currency->rate));
 		uint32 money_c = Clamp(ClampToI32(money), 0, 20000000); // Clamp between 20 million and 0
+			uint32 money_c = Clamp(ClampToI32(money), 0, 20000000); // Clamp between 20 million and 0
 		/* Give 'id' the money, and subtract it from ourself */
 		DoCommandP(0, money_c, _rename_id, CMD_GIVE_MONEY | CMD_MSG(STR_ERROR_INSUFFICIENT_FUNDS), CcGiveMoney, str);
 		break;
+	}
 #endif /* ENABLE_NETWORK */
 			/* Give 'id' the money, and subtract it from ourself */
 			DoCommandP(0, money_c, _rename_id, CMD_GIVE_MONEY | CMD_MSG(STR_ERROR_INSUFFICIENT_FUNDS), CcGiveMoney, str);
 			break;
+		}
 		default: NOT_REACHED();
+	}
@@ @@ -124,14 +120,12 @@ void CcPlaySound_EXPLOSION(const Command @@
 	if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_12_EXPLOSION, tile);
+}
 #ifdef ENABLE_NETWORK
 void ShowNetworkGiveMoneyWindow(CompanyID company)
+{
 	_rename_id = company;
 	_rename_what = 3;
 	ShowQueryString(STR_EMPTY, STR_NETWORK_GIVE_MONEY_CAPTION, 30, NULL, CS_NUMERAL, QSF_NONE);
+}
 #endif /* ENABLE_NETWORK */
 /**
@@ @@ -397,7 +391,6 @@ struct MainWindow : Window @@
 				ResetRestoreAllTransparency();
 				break;
 #ifdef ENABLE_NETWORK
 			case GHK_CHAT: // smart chat; send to team if any, otherwise to all
 				if (_networking) {
 					const NetworkClientInfo *cio = NetworkClientInfo::GetByClientID(_network_own_client_id);
@@ @@ -425,7 +418,6 @@ struct MainWindow : Window @@
 					ShowNetworkChatQueryWindow(DESTTYPE_CLIENT, CLIENT_ID_SERVER);
+				}
 				break;
 #endif
 			default: return ES_NOT_HANDLED;
+		}
@@ @@ -516,12 +508,10 @@ static Hotkey global_hotkeys[] = { @@
 	Hotkey('8' | WKC_CTRL | WKC_SHIFT, "invisibility_catenary", GHK_TOGGLE_INVISIBILITY + 7),
 	Hotkey('X' | WKC_CTRL, "transparency_toolbar", GHK_TRANSPARENCY_TOOLBAR),
 	Hotkey('X', "toggle_transparency", GHK_TRANSPARANCY),
 #ifdef ENABLE_NETWORK
 	Hotkey(_ghk_chat_keys, "chat", GHK_CHAT),
 	Hotkey(_ghk_chat_all_keys, "chat_all", GHK_CHAT_ALL),
 	Hotkey(_ghk_chat_company_keys, "chat_company", GHK_CHAT_COMPANY),
 	Hotkey(_ghk_chat_server_keys, "chat_server", GHK_CHAT_SERVER),
 #endif
 	HOTKEY_LIST_END
 };
 HotkeyList MainWindow::hotkeys("global", global_hotkeys);

src/misc.cpp

➞

Show inline comments

@@ @@ -111,9 +111,7 @@ void InitializeGame(uint size_x, uint si @@
 	InitializeCheats();
 	InitTextEffects();
 #ifdef ENABLE_NETWORK
 	NetworkInitChatMessage();
 #endif /* ENABLE_NETWORK */
 	InitializeAnimatedTiles();
 	InitializeEconomy();

src/misc_cmd.cpp

➞

Show inline comments

@@ @@ -154,12 +154,10 @@ CommandCost CmdPause(TileIndex tile, DoC @@
 		case PM_PAUSED_GAME_SCRIPT:
 			break;
 #ifdef ENABLE_NETWORK
 		case PM_PAUSED_JOIN:
 		case PM_PAUSED_ACTIVE_CLIENTS:
 			if (!_networking) return CMD_ERROR;
 			break;
 #endif /* ENABLE_NETWORK */
 		default: return CMD_ERROR;
+	}
@@ @@ -172,9 +170,7 @@ CommandCost CmdPause(TileIndex tile, DoC @@
 				AskUnsafeUnpauseCallback
 			);
 		} else {
 #ifdef ENABLE_NETWORK
 			PauseMode prev_mode = _pause_mode;
 #endif /* ENABLE_NETWORK */
 			if (p2 == 0) {
 				_pause_mode = _pause_mode & ~p1;
@@ @@ -182,9 +178,7 @@ CommandCost CmdPause(TileIndex tile, DoC @@
 				_pause_mode = _pause_mode | p1;
+			}
 #ifdef ENABLE_NETWORK
 			NetworkHandlePauseChange(prev_mode, (PauseMode)p1);
 #endif /* ENABLE_NETWORK */
+		}
 		SetWindowDirty(WC_STATUS_BAR, 0);

src/network/core/address.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
 #include "../../stdafx.h"
 #ifdef ENABLE_NETWORK
 #include "address.h"
 #include "../../debug.h"
@@ @@ -433,5 +431,3 @@ void NetworkAddress::Listen(int socktype @@
 		default:        return "unsupported";
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/core/address.h

➞

Show inline comments

@@ @@ -17,8 +17,6 @@ @@
 #include "../../string_func.h"
 #include "../../core/smallmap_type.hpp"
 #ifdef ENABLE_NETWORK
 class NetworkAddress;
 typedef SmallVector<NetworkAddress, 4> NetworkAddressList; ///< Type for a list of addresses.
 typedef SmallMap<NetworkAddress, SOCKET, 4> SocketList;    ///< Type for a mapping between address and socket.
@@ @@ -192,5 +190,4 @@ public: @@
 	static const char *AddressFamilyAsString(int family);
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_ADDRESS_H */

src/network/core/core.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file core.cpp Functions used to initialize/shut down the core network
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "os_abstraction.h"
@@ @@ -80,5 +78,3 @@ void NetworkSocketHandler::ReceiveGRFIde @@
 		grf->md5sum[j] = p->Recv_uint8();
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/core/core.h

➞

Show inline comments

@@ @@ -17,8 +17,6 @@ @@
 #include "../../newgrf_config.h"
 #include "config.h"
 #ifdef ENABLE_NETWORK
 bool NetworkCoreInitialize();
 void NetworkCoreShutdown();
@@ @@ -80,6 +78,4 @@ public: @@
 	void SendCompanyInformation(Packet *p, const struct Company *c, const struct NetworkCompanyStats *stats, uint max_len = NETWORK_COMPANY_NAME_LENGTH);
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_CORE_H */

src/network/core/game.h

➞

Show inline comments

@@ @@ -19,8 +19,6 @@ @@
 #include "../../newgrf_config.h"
 #include "../../date_type.h"
 #ifdef ENABLE_NETWORK
 /**
  * The game information that is not generated on-the-fly and has to
  * be sent to the clients.
@@ @@ -58,6 +56,4 @@ struct NetworkGameInfo : NetworkServerGa @@
 const char * GetNetworkRevisionString();
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_GAME_H */

src/network/core/host.cpp

➞

Show inline comments

@@ @@ -9,8 +9,6 @@ @@
 /** @file host.cpp Functions related to getting host specific data (IPs). */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "address.h"
@@ @@ -207,5 +205,3 @@ void NetworkFindBroadcastIPs(NetworkAddr @@
 		DEBUG(net, 3, "%d) %s", i++, addr->GetHostname());
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/core/os_abstraction.h

➞

Show inline comments

 /* Include standard stuff per OS */
 #ifdef ENABLE_NETWORK
 /* Windows stuff */
 #if defined(_WIN32)
 #include <errno.h>
 assert_compile(sizeof(in_addr)  ==  4); ///< IPv4 addresses should be 4 bytes.
 assert_compile(sizeof(in6_addr) == 16); ///< IPv6 addresses should be 16 bytes.
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_OS_ABSTRACTION_H */

src/network/core/packet.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file packet.cpp Basic functions to create, fill and read packets.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../string_func.h"
@@ @@ -310,5 +308,3 @@ void Packet::Recv_string(char *buffer, s @@
 	str_validate(bufp, last, settings);
+}
 #endif /* ENABLE_NETWORK */

src/network/core/packet.h

➞

Show inline comments

@@ @@ -18,8 +18,6 @@ @@
 #include "core.h"
 #include "../../string_type.h"
 #ifdef ENABLE_NETWORK
 typedef uint16 PacketSize; ///< Size of the whole packet.
 typedef uint8  PacketType; ///< Identifier for the packet
@@ @@ -87,6 +85,4 @@ public: @@
 	void   Recv_string(char *buffer, size_t size, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK);
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_PACKET_H */

src/network/core/tcp.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file tcp.cpp Basic functions to receive and send TCP packets.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../debug.h"
@@ @@ -243,5 +241,3 @@ bool NetworkTCPSocketHandler::CanSendRec @@
 	this->writable = !!FD_ISSET(this->sock, &write_fd);
 	return FD_ISSET(this->sock, &read_fd) != 0;
+}
 #endif /* ENABLE_NETWORK */

src/network/core/tcp.h

➞

Show inline comments

@@ @@ -17,8 +17,6 @@ @@
 #include "address.h"
 #include "packet.h"
 #ifdef ENABLE_NETWORK
 /** The states of sending the packets. */
 enum SendPacketsState {
 	SPS_CLOSED,      ///< The connection got closed.
@@ @@ -99,6 +97,4 @@ public: @@
 	static void KillAll();
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_TCP_H */

src/network/core/tcp_admin.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file tcp_admin.cpp Basic functions to receive and send TCP packets to and from the admin network.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../network_internal.h"
@@ @@ -172,5 +170,3 @@ NetworkRecvStatus NetworkAdminSocketHand @@
 NetworkRecvStatus NetworkAdminSocketHandler::Receive_SERVER_CMD_LOGGING(Packet *p) { return this->ReceiveInvalidPacket(ADMIN_PACKET_SERVER_CMD_LOGGING); }
 NetworkRecvStatus NetworkAdminSocketHandler::Receive_SERVER_RCON_END(Packet *p) { return this->ReceiveInvalidPacket(ADMIN_PACKET_SERVER_RCON_END); }
 NetworkRecvStatus NetworkAdminSocketHandler::Receive_SERVER_PONG(Packet *p) { return this->ReceiveInvalidPacket(ADMIN_PACKET_SERVER_PONG); }
 #endif /* ENABLE_NETWORK */

src/network/core/tcp_admin.h

➞

Show inline comments

@@ @@ -19,8 +19,6 @@ @@
 #include "../network_type.h"
 #include "../../core/pool_type.hpp"
 #ifdef ENABLE_NETWORK
 /**
  * Enum with types of TCP packets specific to the admin network.
  * This protocol may only be extended to ensure stability.
@@ @@ -500,6 +498,4 @@ public: @@
+	}
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_TCP_ADMIN_H */

src/network/core/tcp_connect.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file tcp_connect.cpp Basic functions to create connections without blocking.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../thread/thread.h"
@@ @@ -97,5 +95,3 @@ void TCPConnecter::Connect() @@
+{
 	for (TCPConnecter **iter = _tcp_connecters.Begin(); iter != _tcp_connecters.End(); iter++) (*iter)->killed = true;
+}
 #endif /* ENABLE_NETWORK */

src/network/core/tcp_content.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file tcp_content.cpp Basic functions to receive and send Content packets.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #ifndef OPENTTD_MSU
 #include "../../textfile_gui.h"
@@ @@ -266,5 +264,3 @@ Subdirectory GetContentInfoSubDir(Conten @@
+	}
+}
 #endif /* OPENTTD_MSU */
 #endif /* ENABLE_NETWORK */

src/network/core/tcp_content.h

➞

Show inline comments

@@ @@ -19,8 +19,6 @@ @@
 #include "packet.h"
 #include "../../debug.h"
 #ifdef ENABLE_NETWORK
 /** The values in the enum are important; they are used as database 'keys' */
 enum ContentType {
 	CONTENT_TYPE_BEGIN         = 1, ///< Helper to mark the begin of the types
@@ @@ -213,6 +211,4 @@ public: @@
 Subdirectory GetContentInfoSubDir(ContentType type);
 #endif /* OPENTTD_MSU */
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_TCP_CONTENT_H */

src/network/core/tcp_game.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file tcp_game.cpp Basic functions to receive and send TCP packets for game purposes.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../network.h"
@@ @@ -199,5 +197,3 @@ NetworkRecvStatus NetworkGameSocketHandl @@
 NetworkRecvStatus NetworkGameSocketHandler::Receive_CLIENT_MOVE(Packet *p) { return this->ReceiveInvalidPacket(PACKET_CLIENT_MOVE); }
 NetworkRecvStatus NetworkGameSocketHandler::Receive_SERVER_COMPANY_UPDATE(Packet *p) { return this->ReceiveInvalidPacket(PACKET_SERVER_COMPANY_UPDATE); }
 NetworkRecvStatus NetworkGameSocketHandler::Receive_SERVER_CONFIG_UPDATE(Packet *p) { return this->ReceiveInvalidPacket(PACKET_SERVER_CONFIG_UPDATE); }
 #endif /* ENABLE_NETWORK */

src/network/core/tcp_game.h

➞

Show inline comments

@@ @@ -19,8 +19,6 @@ @@
 #include "../network_type.h"
 #include "../../core/pool_type.hpp"
 #ifdef ENABLE_NETWORK
 /**
  * Enum with all types of TCP packets.
  * For the exact meaning, look at #NetworkGameSocketHandler.
@@ @@ -558,6 +556,4 @@ public: @@
 	void SendCommand(Packet *p, const CommandPacket *cp);
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_TCP_GAME_H */

src/network/core/tcp_http.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file tcp_http.cpp Basic functions to receive and send HTTP TCP packets.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../rev.h"
@@ @@ -331,5 +329,3 @@ int NetworkHTTPSocketHandler::Receive() @@
 		iter++;
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/core/tcp_http.h

➞

Show inline comments

@@ @@ -16,8 +16,6 @@ @@
 #include "tcp.h"
 #ifdef ENABLE_NETWORK
 /** Callback for when the HTTP handler has something to tell us. */
 struct HTTPCallback {
 	/**
@@ @@ -122,6 +120,4 @@ public: @@
+	}
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_TCP_HTTP_H */

src/network/core/tcp_listen.h

➞

Show inline comments

@@ @@ -20,8 +20,6 @@ @@
 #include "../../debug.h"
 #include "table/strings.h"
 #ifdef ENABLE_NETWORK
 /**
  * Template for TCP listeners.
  * @param Tsocket      The class we create sockets for.
@@ @@ -173,6 +171,4 @@ public: @@
 template <class Tsocket, PacketType Tfull_packet, PacketType Tban_packet> SocketList TCPListenHandler<Tsocket, Tfull_packet, Tban_packet>::sockets;
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_TCP_LISTEN_H */

src/network/core/udp.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
  * @file core/udp.cpp Basic functions to receive and send UDP packets.
  */
 #ifdef ENABLE_NETWORK
 #include "../../stdafx.h"
 #include "../../date_func.h"
 #include "../../debug.h"
@@ @@ -347,5 +345,3 @@ void NetworkUDPSocketHandler::Receive_SE @@
 void NetworkUDPSocketHandler::Receive_CLIENT_GET_NEWGRFS(Packet *p, NetworkAddress *client_addr) { this->ReceiveInvalidPacket(PACKET_UDP_CLIENT_GET_NEWGRFS, client_addr); }
 void NetworkUDPSocketHandler::Receive_SERVER_NEWGRFS(Packet *p, NetworkAddress *client_addr) { this->ReceiveInvalidPacket(PACKET_UDP_SERVER_NEWGRFS, client_addr); }
 void NetworkUDPSocketHandler::Receive_MASTER_SESSION_KEY(Packet *p, NetworkAddress *client_addr) { this->ReceiveInvalidPacket(PACKET_UDP_MASTER_SESSION_KEY, client_addr); }
 #endif /* ENABLE_NETWORK */

src/network/core/udp.h

➞

Show inline comments

@@ @@ -18,8 +18,6 @@ @@
 #include "game.h"
 #include "packet.h"
 #ifdef ENABLE_NETWORK
 /** Enum with all types of UDP packets. The order MUST not be changed **/
 enum PacketUDPType {
 	PACKET_UDP_CLIENT_FIND_SERVER,   ///< Queries a game server for game information
@@ @@ -246,6 +244,4 @@ public: @@
 	void ReceiveNetworkGameInfo(Packet *p, NetworkGameInfo *info);
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CORE_UDP_H */

src/network/network.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
 #include "../stdafx.h"
 #ifdef ENABLE_NETWORK
 #include "../strings_func.h"
 #include "../command_func.h"
 #include "../date_func.h"
@@ @@ -1172,5 +1170,3 @@ bool IsNetworkCompatibleVersion(const ch @@
 	const char *hash2 = ExtractNetworkRevisionHash(other);
 	return hash1 && hash2 && (strncmp(hash1, hash2, GITHASH_SUFFIX_LEN) == 0);
+}
 #endif /* ENABLE_NETWORK */

src/network/network.h

➞

Show inline comments

@@ @@ -12,9 +12,6 @@ @@
 #ifndef NETWORK_H
 #define NETWORK_H
 #ifdef ENABLE_NETWORK
 void NetworkStartUp();
 void NetworkShutDown();
 void NetworkDrawChatMessage();
@@ @@ -26,19 +23,4 @@ extern bool _network_available; ///< is @@
 extern bool _network_dedicated;  ///< are we a dedicated server?
 extern bool _is_network_server;  ///< Does this client wants to be a network-server?
 #else /* ENABLE_NETWORK */
 /* Network function stubs when networking is disabled */
 static inline void NetworkStartUp() {}
 static inline void NetworkShutDown() {}
 static inline void NetworkDrawChatMessage() {}
 static inline bool HasClients() { return false; }
 #define _networking 0
 #define _network_server 0
 #define _network_available 0
 #define _network_dedicated 0
 #define _is_network_server 0
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_H */

src/network/network_admin.cpp

➞

Show inline comments

@@ @@ -9,8 +9,6 @@ @@
 /** @file network_admin.cpp Server part of the admin network protocol. */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "../strings_func.h"
 #include "../date_func.h"
@@ @@ -1045,5 +1043,3 @@ void NetworkAdminUpdate(AdminUpdateFrequ @@
+		}
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/network_admin.h

➞

Show inline comments

@@ @@ -12,8 +12,6 @@ @@
 #ifndef NETWORK_ADMIN_H
 #define NETWORK_ADMIN_H
 #ifdef ENABLE_NETWORK
 #include "network_internal.h"
 #include "core/tcp_listen.h"
 #include "core/tcp_admin.h"
@@ @@ -124,5 +122,4 @@ void NetworkAdminConsole(const char *ori @@
 void NetworkAdminGameScript(const char *json);
 void NetworkAdminCmdLogging(const NetworkClientSocket *owner, const CommandPacket *cp);
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_ADMIN_H */

src/network/network_base.h

➞

Show inline comments

@@ @@ -12,8 +12,6 @@ @@
 #ifndef NETWORK_BASE_H
 #define NETWORK_BASE_H
 #ifdef ENABLE_NETWORK
 #include "network_type.h"
 #include "core/address.h"
 #include "../core/pool_type.hpp"
@@ @@ -54,5 +52,4 @@ struct NetworkClientInfo : NetworkClient @@
  */
 #define FOR_ALL_CLIENT_INFOS(var) FOR_ALL_CLIENT_INFOS_FROM(var, 0)
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_BASE_H */

src/network/network_chat_gui.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
 #include <stdarg.h> /* va_list */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "../strings_func.h"
 #include "../blitter/factory.hpp"
@@ @@ -562,5 +560,3 @@ void ShowNetworkChatQueryWindow(DestType @@
 	DeleteWindowByClass(WC_SEND_NETWORK_MSG);
 	new NetworkChatWindow(&_chat_window_desc, type, dest);
+}
 #endif /* ENABLE_NETWORK */

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -9,8 +9,6 @@ @@
 /** @file network_client.cpp Client part of the network protocol. */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "network_gui.h"
 #include "../saveload/saveload.h"
@@ @@ -1320,5 +1318,3 @@ bool NetworkMaxSpectatorsReached() @@
+{
 	return NetworkSpectatorCount() >= (_network_server ? _settings_client.network.max_spectators : _network_server_max_spectators);
+}
 #endif /* ENABLE_NETWORK */

src/network/network_client.h

➞

Show inline comments

@@ @@ -12,8 +12,6 @@ @@
 #ifndef NETWORK_CLIENT_H
 #define NETWORK_CLIENT_H
 #ifdef ENABLE_NETWORK
 #include "network_internal.h"
 /** Class for handling the client side of the game connection. */
@@ @@ -118,6 +116,4 @@ extern CompanyID _network_join_as; @@
 extern const char *_network_join_server_password;
 extern const char *_network_join_company_password;
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CLIENT_H */

src/network/network_command.cpp

➞

Show inline comments

@@ @@ -9,8 +9,6 @@ @@
 /** @file network_command.cpp Command handling over network connections. */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "network_admin.h"
 #include "network_client.h"
@@ @@ -344,5 +342,3 @@ void NetworkGameSocketHandler::SendComma @@
+	}
 	p->Send_uint8 (callback);
+}
 #endif /* ENABLE_NETWORK */

src/network/network_content.cpp

➞

Show inline comments

@@ @@ -9,8 +9,6 @@ @@
 /** @file network_content.cpp Content sending/receiving part of the network protocol. */
 #if defined(ENABLE_NETWORK)
 #include "../stdafx.h"
 #include "../rev.h"
 #include "../ai/ai.hpp"
@@ @@ -1090,5 +1088,3 @@ void ClientNetworkContentSocketHandler:: @@
 		if (iter != this->callbacks.End() && *iter == cb) iter++;
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/network_content.h

➞

Show inline comments

@@ @@ -15,8 +15,6 @@ @@
 #include "core/tcp_content.h"
 #include "core/tcp_http.h"
 #if defined(ENABLE_NETWORK)
 /** Vector with content info */
 typedef SmallVector<ContentInfo *, 16> ContentVector;
 /** Vector with constant content info */
@@ @@ -153,8 +151,4 @@ void ShowNetworkContentListWindow(Conten @@
 void ShowMissingContentWindow(const struct GRFConfig *list);
 #else
 static inline void ShowNetworkContentListWindow() {}
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_CONTENT_H */

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -9,7 +9,6 @@ @@
 /** @file network_content_gui.cpp Implementation of the Network Content related GUIs. */
 #if defined(ENABLE_NETWORK)
 #include "../stdafx.h"
 #include "../strings_func.h"
 #include "../gfx_func.h"
@@ @@ -1168,5 +1167,3 @@ void ShowNetworkContentListWindow(Conten @@
+	}
 #endif /* WITH_ZLIB */
+}
 #endif /* ENABLE_NETWORK */

src/network/network_func.h

➞

Show inline comments

@@ @@ -26,8 +26,6 @@ @@
 #include "../openttd.h"
 #include "../company_type.h"
 #ifdef ENABLE_NETWORK
 extern NetworkServerGameInfo _network_game_info;
 extern NetworkCompanyState *_network_company_states;
@@ @@ -90,5 +88,4 @@ void NetworkChatMessageLoop(); @@
 void NetworkAfterNewGRFScan();
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_FUNC_H */

src/network/network_gamelist.cpp

➞

Show inline comments

@@ @@ -12,8 +12,6 @@ @@
  * Also, it handles the request to a server for data about the server
  */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../window_func.h"
@@ @@ -206,5 +204,3 @@ void NetworkAfterNewGRFScan() @@
 	InvalidateWindowClassesData(WC_NETWORK_WINDOW);
+}
 #endif /* ENABLE_NETWORK */

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -9,7 +9,6 @@ @@
 /** @file network_gui.cpp Implementation of the Network related GUIs. */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "../strings_func.h"
 #include "../date_func.h"
@@ @@ -2241,5 +2240,3 @@ void ShowNetworkCompanyPasswordWindow(Wi @@
 	new NetworkCompanyPasswordWindow(&_network_company_password_window_desc, parent);
+}
 #endif /* ENABLE_NETWORK */

src/network/network_gui.h

➞

Show inline comments

@@ @@ -17,8 +17,6 @@ @@
 #include "../window_type.h"
 #include "network_type.h"
 #ifdef ENABLE_NETWORK
 void ShowNetworkNeedPassword(NetworkPasswordType npt);
 void ShowNetworkGiveMoneyWindow(CompanyID company);
 void ShowNetworkChatQueryWindow(DestType type, int dest);
@@ @@ -42,14 +40,4 @@ struct NetworkCompanyInfo : NetworkCompa @@
 NetworkCompanyInfo *GetLobbyCompanyInfo(CompanyID company);
 #else /* ENABLE_NETWORK */
 /* Network function stubs when networking is disabled */
 static inline void ShowNetworkChatQueryWindow(byte desttype, int dest) {}
 static inline void ShowClientList() {}
 static inline void ShowNetworkGameWindow() {}
 static inline void ShowNetworkCompanyPasswordWindow(Window *parent) {}
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_GUI_H */

src/network/network_internal.h

➞

Show inline comments

@@ @@ -17,8 +17,6 @@ @@
 #include "../command_type.h"
 #ifdef ENABLE_NETWORK
 #ifdef RANDOM_DEBUG
 /**
  * If this line is enable, every frame will have a sync test
@@ @@ -171,5 +169,4 @@ StringID GetNetworkErrorMsg(NetworkError @@
 bool NetworkFindName(char *new_name, const char *last);
 const char *GenerateCompanyPasswordHash(const char *password, const char *password_server_id, uint32 password_game_seed);
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_INTERNAL_H */

src/network/network_server.cpp

➞

Show inline comments

@@ @@ -9,8 +9,6 @@ @@
 /** @file network_server.cpp Server part of the network protocol. */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "../strings_func.h"
 #include "../date_func.h"
@@ @@ -2206,5 +2204,3 @@ void NetworkServerNewCompany(const Compa @@
 		NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, c->index + 1);
+	}
+}
 #endif /* ENABLE_NETWORK */

src/network/network_server.h

➞

Show inline comments

@@ @@ -12,8 +12,6 @@ @@
 #ifndef NETWORK_SERVER_H
 #define NETWORK_SERVER_H
 #ifdef ENABLE_NETWORK
 #include "network_internal.h"
 #include "core/tcp_listen.h"
 #include "../thread/thread.h"
@@ @@ -138,12 +136,4 @@ void NetworkServerUpdateCompanyPassworde @@
  */
 #define FOR_ALL_CLIENT_SOCKETS(var) FOR_ALL_CLIENT_SOCKETS_FROM(var, 0)
 #else /* ENABLE_NETWORK */
 /* Network function stubs when networking is disabled */
 static inline void NetworkServerMonthlyLoop() {}
 static inline void NetworkServerYearlyLoop() {}
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_SERVER_H */

src/network/network_type.h

➞

Show inline comments

@@ @@ -14,8 +14,6 @@ @@
 #include "core/game.h"
 #ifdef ENABLE_NETWORK
 /** How many clients can we have */
 static const uint MAX_CLIENTS = 255;
@@ @@ -130,5 +128,4 @@ enum NetworkErrorCode { @@
 	NETWORK_ERROR_END,
 };
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_TYPE_H */

src/network/network_udp.cpp

➞

Show inline comments

@@ @@ -14,8 +14,6 @@ @@
  * communication before the game is being joined.
  */
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
 #include "../date_func.h"
 #include "../map_func.h"
@@ @@ -714,5 +712,3 @@ void NetworkBackgroundUDPLoop() @@
 	_network_udp_mutex->EndCritical();
+}
 #endif /* ENABLE_NETWORK */

src/network/network_udp.h

➞

Show inline comments

@@ @@ -12,8 +12,6 @@ @@
 #ifndef NETWORK_UDP_H
 #define NETWORK_UDP_H
 #ifdef ENABLE_NETWORK
 #include "core/address.h"
 void NetworkUDPInitialize();
@@ @@ -25,6 +23,4 @@ void NetworkUDPRemoveAdvertise(bool bloc @@
 void NetworkUDPClose();
 void NetworkBackgroundUDPLoop();
 #endif /* ENABLE_NETWORK */
 #endif /* NETWORK_UDP_H */

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -757,9 +757,7 @@ void DoScanNewGRFFiles(void *callback) @@
 		free(to_sort);
 #ifdef ENABLE_NETWORK
 		NetworkAfterNewGRFScan();
 #endif
+	}
 	_modal_progress_work_mutex->EndCritical();
@@ @@ -826,8 +824,6 @@ const GRFConfig *FindGRFConfig(uint32 gr @@
 	return best;
+}
 #ifdef ENABLE_NETWORK
 /** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */
 struct UnknownGRF : public GRFIdentifier {
 	UnknownGRF *next;     ///< The next unknown GRF.
@@ @@ -877,9 +873,6 @@ GRFTextWrapper *FindUnknownGRFName(uint3 @@
 	return grf->name;
+}
 #endif /* ENABLE_NETWORK */
 /**
  * Retrieve a NewGRF from the current config by its grfid.
  * @param grfid grf to look for.

src/newgrf_config.h

➞

Show inline comments

@@ @@ -229,11 +229,9 @@ char *GRFBuildParamList(char *dst, const @@
 /* In newgrf_gui.cpp */
 void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);
 #ifdef ENABLE_NETWORK
 /** For communication about GRFs over the network */
 #define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>"
 GRFTextWrapper *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
 #endif /* ENABLE_NETWORK */
 void UpdateNewGRFScanStatus(uint num, const char *name);
 bool UpdateNewGRFConfigPalette(int32 p1 = 0);

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -1126,11 +1126,9 @@ struct NewGRFWindow : public Window, New @@
 				if (!_network_available) {
 					ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
 				} else {
 #if defined(ENABLE_NETWORK)
 					this->DeleteChildWindows(WC_QUERY_STRING); // Remove the parameter query window
 					ShowMissingContentWindow(this->actives);
 #endif
+				}
 				break;
@@ @@ -1543,7 +1541,6 @@ private: @@
+	}
 };
 #if defined(ENABLE_NETWORK)
 /**
  * Show the content list window with all missing grfs from the given list.
  * @param list The list of grfs to check for missing / not exactly matching ones.
@@ @@ -1565,7 +1562,6 @@ void ShowMissingContentWindow(const GRFC @@
+	}
 	ShowNetworkContentListWindow(cv.Length() == 0 ? NULL : &cv, CONTENT_TYPE_NEWGRF);
+}
 #endif
 Listing NewGRFWindow::last_sorting     = {false, 0};
 Filtering NewGRFWindow::last_filtering = {false, 0};

src/openttd.cpp

➞

Show inline comments

@@ @@ -164,7 +164,6 @@ static void ShowHelp() @@
 		"  -e                  = Start Editor\n"
 		"  -g [savegame]       = Start new/save game immediately\n"
 		"  -G seed             = Set random seed\n"
 #if defined(ENABLE_NETWORK)
 		"  -n [ip:port#company]= Join network game\n"
 		"  -p password         = Password to join server\n"
 		"  -P password         = Password to join company\n"
@@ @@ -173,7 +172,6 @@ static void ShowHelp() @@
 #if !defined(_WIN32)
 		"  -f                  = Fork into the background (dedicated only)\n"
 #endif
 #endif /* ENABLE_NETWORK */
 		"  -I graphics_set     = Force the graphics set (see below)\n"
 		"  -S sounds_set       = Force the sounds set (see below)\n"
 		"  -M music_set        = Force the music set (see below)\n"
@@ @@ -300,9 +298,7 @@ static void ShutdownGame() @@
 	/* Uninitialize variables that are allocated dynamically */
 	GamelogReset();
 #ifdef ENABLE_NETWORK
 	free(_config_file);
 #endif
 	LinkGraphSchedule::Clear();
 	PoolBase::Clean(PT_ALL);
@@ @@ -447,13 +443,11 @@ struct AfterNewGRFScan : NewGRFScanCallb @@
 		if (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear;
 		if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed;
 #if defined(ENABLE_NETWORK)
 		if (dedicated_host != NULL) {
 			_network_bind_list.Clear();
 			*_network_bind_list.Append() = stredup(dedicated_host);
+		}
 		if (dedicated_port != 0) _settings_client.network.server_port = dedicated_port;
 #endif /* ENABLE_NETWORK */
 		/* initialize the ingame console */
 		IConsoleInit();
@@ @@ -463,7 +457,6 @@ struct AfterNewGRFScan : NewGRFScanCallb @@
 		/* Make sure _settings is filled with _settings_newgame if we switch to a game directly */
 		if (_switch_mode != SM_NONE) MakeNewgameSettingsLive();
 #ifdef ENABLE_NETWORK
 		if (_network_available && network_conn != NULL) {
 			const char *port = NULL;
 			const char *company = NULL;
@@ @@ -489,7 +482,6 @@ struct AfterNewGRFScan : NewGRFScanCallb @@
 			_switch_mode = SM_NONE;
 			NetworkClientConnectGame(NetworkAddress(network_conn, rport), join_as, join_server_password, join_company_password);
+		}
 #endif /* ENABLE_NETWORK */
 		/* After the scan we're not used anymore. */
 		delete this;
@@ @@ -509,7 +501,6 @@ static const OptionData _options[] = { @@
 	 GETOPT_SHORT_VALUE('s'),
 	 GETOPT_SHORT_VALUE('v'),
 	 GETOPT_SHORT_VALUE('b'),
 #if defined(ENABLE_NETWORK)
 	GETOPT_SHORT_OPTVAL('D'),
 	GETOPT_SHORT_OPTVAL('n'),
 	 GETOPT_SHORT_VALUE('l'),
@@ @@ -518,7 +509,6 @@ static const OptionData _options[] = { @@
 #if !defined(_WIN32)
 	 GETOPT_SHORT_NOVAL('f'),
 #endif
 #endif /* ENABLE_NETWORK */
 	 GETOPT_SHORT_VALUE('r'),
 	 GETOPT_SHORT_VALUE('t'),
 	GETOPT_SHORT_OPTVAL('d'),
@@ @@ -551,13 +541,11 @@ int openttd_main(int argc, char *argv[]) @@
 	/* AfterNewGRFScan sets save_config to true after scanning completed. */
 	bool save_config = false;
 	AfterNewGRFScan *scanner = new AfterNewGRFScan(&save_config);
 #if defined(ENABLE_NETWORK)
 	bool dedicated = false;
 	char *debuglog_conn = NULL;
 	extern bool _dedicated_forks;
 	_dedicated_forks = false;
 #endif /* ENABLE_NETWORK */
 	_game_mode = GM_MENU;
 	_switch_mode = SM_MENU;
@@ @@ -576,7 +564,6 @@ int openttd_main(int argc, char *argv[]) @@
 		case 's': free(sounddriver); sounddriver = stredup(mgo.opt); break;
 		case 'v': free(videodriver); videodriver = stredup(mgo.opt); break;
 		case 'b': free(blitter); blitter = stredup(mgo.opt); break;
 #if defined(ENABLE_NETWORK)
 		case 'D':
 			free(musicdriver);
 			free(sounddriver);
@@ @@ -611,7 +598,6 @@ int openttd_main(int argc, char *argv[]) @@
 		case 'P':
 			scanner->join_company_password = mgo.opt;
 			break;
 #endif /* ENABLE_NETWORK */
 		case 'r': ParseResolution(&resolution, mgo.opt); break;
 		case 't': scanner->startyear = atoi(mgo.opt); break;
 		case 'd': {
@@ @@ -702,7 +688,6 @@ int openttd_main(int argc, char *argv[]) @@
 	DeterminePaths(argv[0]);
 	TarScanner::DoScan(TarScanner::BASESET);
 #if defined(ENABLE_NETWORK)
 	if (dedicated) DEBUG(net, 0, "Starting dedicated version %s", _openttd_revision);
 	if (_dedicated_forks && !dedicated) _dedicated_forks = false;
@@ @@ -710,7 +695,6 @@ int openttd_main(int argc, char *argv[]) @@
 	/* We must fork here, or we'll end up without some resources we need (like sockets) */
 	if (_dedicated_forks) DedicatedFork();
 #endif
 #endif
 	LoadFromConfig(true);
@@ @@ -787,7 +771,6 @@ int openttd_main(int argc, char *argv[]) @@
 	NetworkStartUp(); // initialize network-core
 #if defined(ENABLE_NETWORK)
 	if (debuglog_conn != NULL && _network_available) {
 		const char *not_used = NULL;
 		const char *port = NULL;
@@ @@ -800,7 +783,6 @@ int openttd_main(int argc, char *argv[]) @@
 		NetworkStartDebugLog(NetworkAddress(debuglog_conn, rport));
+	}
 #endif /* ENABLE_NETWORK */
 	if (!HandleBootstrap()) {
 		ShutdownGame();
@@ @@ -903,12 +885,10 @@ exit_normal: @@
 	delete scanner;
 #ifdef ENABLE_NETWORK
 	extern FILE *_log_fd;
 	if (_log_fd != NULL) {
 		fclose(_log_fd);
+	}
 #endif /* ENABLE_NETWORK */
 	return ret;
+}
@@ @@ -957,13 +937,11 @@ static void MakeNewGameDone() @@
 	InitializeRailGUI();
 #ifdef ENABLE_NETWORK
 	/* We are the server, we start a new company (not dedicated),
 	 * so set the default password *if* needed. */
 	if (_network_server && !StrEmpty(_settings_client.network.default_company_pass)) {
 		NetworkChangeCompanyPassword(_local_company, _settings_client.network.default_company_pass);
+	}
 #endif /* ENABLE_NETWORK */
 	if (_settings_client.gui.pause_on_newgame) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
@@ @@ -1019,7 +997,6 @@ bool SafeLoad(const char *filename, Save @@
 		case SL_OK: return true;
 		case SL_REINIT:
 #ifdef ENABLE_NETWORK
 			if (_network_dedicated) {
 				/*
 				 * We need to reinit a network map...
@@ @@ -1035,7 +1012,6 @@ bool SafeLoad(const char *filename, Save @@
 				/* We can't load the intro game as server, so disconnect first. */
 				NetworkDisconnect();
+			}
 #endif /* ENABLE_NETWORK */
 			switch (ogm) {
 				default:
@@ @@ -1052,7 +1028,6 @@ bool SafeLoad(const char *filename, Save @@
 void SwitchToMode(SwitchMode new_mode)
+{
 #ifdef ENABLE_NETWORK
 	/* If we are saving something, the network stays in his current state */
 	if (new_mode != SM_SAVE_GAME) {
 		/* If the network is active, make it not-active */
@@ @@ -1081,7 +1056,7 @@ void SwitchToMode(SwitchMode new_mode) @@
+			}
+		}
+	}
-#endif /* ENABLE_NETWORK */
 	/* Make sure all AI controllers are gone at quitting game */
 	if (new_mode != SM_SAVE_GAME) AI::KillAll();
@@ @@ -1092,11 +1067,9 @@ void SwitchToMode(SwitchMode new_mode) @@
 		case SM_RESTARTGAME: // Restart --> 'Random game' with current settings
 		case SM_NEWGAME: // New Game --> 'Random game'
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
 				seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "Random Map");
+			}
 #endif /* ENABLE_NETWORK */
 			MakeNewGame(false, new_mode == SM_NEWGAME);
 			break;
@@ @@ -1119,21 +1092,17 @@ void SwitchToMode(SwitchMode new_mode) @@
 				IConsoleCmdExec("exec scripts/game_start.scr 0");
 				/* Decrease pause counter (was increased from opening load dialog) */
 				DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE);
 #ifdef ENABLE_NETWORK
 				if (_network_server) {
 					seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title);
+				}
 #endif /* ENABLE_NETWORK */
+			}
 			break;
+		}
 		case SM_START_HEIGHTMAP: // Load a heightmap and start a new game from it
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
 				seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "%s (Heightmap)", _file_to_saveload.title);
+			}
 #endif /* ENABLE_NETWORK */
 			MakeNewGame(true, true);
 			break;
@@ @@ -1451,10 +1420,8 @@ static void DoAutosave() @@
 void GameLoop()
+{
 	if (_game_mode == GM_BOOTSTRAP) {
 #ifdef ENABLE_NETWORK
 		/* Check for UDP stuff */
 		if (_network_available) NetworkBackgroundLoop();
 #endif
 		InputLoop();
 		return;
+	}
@@ @@ -1477,7 +1444,6 @@ void GameLoop() @@
 	IncreaseSpriteLRU();
 	InteractiveRandom();
 #ifdef ENABLE_NETWORK
 	/* Check for UDP stuff */
 	if (_network_available) NetworkBackgroundLoop();
@@ @@ -1493,9 +1459,6 @@ void GameLoop() @@
 		/* Singleplayer */
 		StateGameLoop();
+	}
 #else
 	StateGameLoop();
 #endif /* ENABLE_NETWORK */
 	if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();

src/order_backup.cpp

➞

Show inline comments

@@ @@ -193,11 +193,7 @@ CommandCost CmdClearOrderBackup(TileInde @@
 	 * but compiled it. A network client has its own variable for the unique
 	 * client/user identifier. Finally if networking isn't compiled in the
 	 * default is just plain and simple: 0. */
 #ifdef ENABLE_NETWORK
 	uint32 user = _networking && !_network_server ? _network_own_client_id : CLIENT_ID_SERVER;
 #else
 	uint32 user = 0;
 #endif
 	OrderBackup *ob;
 	FOR_ALL_ORDER_BACKUPS(ob) {

src/script/api/script_admin.cpp

➞

Show inline comments

@@ @@ -135,7 +135,6 @@ @@
 	std::string json;
 	ScriptAdmin::MakeJSON(vm, -1, SQUIRREL_MAX_DEPTH, json);
 #ifdef ENABLE_NETWORK
 	if (json.length() > NETWORK_GAMESCRIPT_JSON_LENGTH) {
 		ScriptLog::Error("You are trying to send a table that is too large to the AdminPort. No data sent.");
 		sq_pushinteger(vm, 0);
@@ @@ -143,7 +142,6 @@ @@
+	}
 	NetworkAdminGameScript(json.c_str());
 #endif /* ENABLE_NETWORK */
 	sq_pushinteger(vm, 1);
 	return 1;

src/script/api/script_client.cpp

➞

Show inline comments

@@ @@ -16,7 +16,6 @@ @@
 #include "../../safeguards.h"
 #ifdef ENABLE_NETWORK
 /**
  * Finds NetworkClientInfo given client-identifier,
  *  is used by other methods to resolve client-identifier.
@@ @@ -29,46 +28,29 @@ static NetworkClientInfo *FindClientInfo @@
 	if (!_networking) return NULL;
 	return NetworkClientInfo::GetByClientID((::ClientID)client);
+}
 #endif
 /* static */ ScriptClient::ClientID ScriptClient::ResolveClientID(ScriptClient::ClientID client)
+{
 #ifdef ENABLE_NETWORK
 	return (FindClientInfo(client) == NULL ? ScriptClient::CLIENT_INVALID : client);
 #else
 	return CLIENT_INVALID;
 #endif
+}
 /* static */ char *ScriptClient::GetName(ScriptClient::ClientID client)
+{
 #ifdef ENABLE_NETWORK
 	NetworkClientInfo *ci = FindClientInfo(client);
 	if (ci == NULL) return NULL;
 	return stredup(ci->client_name);
 #else
 	return NULL;
 #endif
+}
 /* static */ ScriptCompany::CompanyID ScriptClient::GetCompany(ScriptClient::ClientID client)
+{
 #ifdef ENABLE_NETWORK
 	NetworkClientInfo *ci = FindClientInfo(client);
 	if (ci == NULL) return ScriptCompany::COMPANY_INVALID;
 	return (ScriptCompany::CompanyID)ci->client_playas;
 #else
 	return ScriptCompany::COMPANY_INVALID;
 #endif
+}
 /* static */ ScriptDate::Date ScriptClient::GetJoinDate(ScriptClient::ClientID client)
+{
 #ifdef ENABLE_NETWORK
 	NetworkClientInfo *ci = FindClientInfo(client);
 	if (ci == NULL) return ScriptDate::DATE_INVALID;
 	return (ScriptDate::Date)ci->join_date;
 #else
 	return ScriptDate::DATE_INVALID;
 #endif
+}

src/script/api/script_clientlist.cpp

➞

Show inline comments

@@ @@ -19,18 +19,15 @@ @@
 ScriptClientList::ScriptClientList()
+{
 #ifdef ENABLE_NETWORK
 	if (!_networking) return;
 	NetworkClientInfo *ci;
 	FOR_ALL_CLIENT_INFOS(ci) {
 		this->AddItem(ci->client_id);
+	}
 #endif
+}
 ScriptClientList_Company::ScriptClientList_Company(ScriptCompany::CompanyID company)
+{
 #ifdef ENABLE_NETWORK
 	if (!_networking) return;
 	CompanyID c;
 	if (company == ScriptCompany::COMPANY_SPECTATOR) {
@@ @@ -45,5 +42,4 @@ ScriptClientList_Company::ScriptClientLi @@
 	FOR_ALL_CLIENT_INFOS(ci) {
 		if (ci->client_playas == c) this->AddItem(ci->client_id);
+	}
 #endif
+}

src/script/api/script_game.cpp

➞

Show inline comments

@@ @@ -39,9 +39,5 @@ @@
 /* static */ bool ScriptGame::IsMultiplayer()
+{
 #ifdef ENABLE_NETWORK
 	return _network_server;
 #else
 	return false;
 #endif
+}

src/script/api/script_goal.cpp

➞

Show inline comments

@@ @@ -137,12 +137,8 @@ @@
+{
 	EnforcePrecondition(false, ScriptGame::IsMultiplayer());
 	EnforcePrecondition(false, ScriptClient::ResolveClientID(client) != ScriptClient::CLIENT_INVALID);
 #ifdef ENABLE_NETWORK
 	ClientIndex c = NetworkClientInfo::GetByClientID((::ClientID)client)->index;
 	return DoQuestion(uniqueid, c, true, question, type, buttons);
 #else
 	return false;
 #endif
+}
 /* static */ bool ScriptGoal::CloseQuestion(uint16 uniqueid)

src/script/api/script_object.cpp

➞

Show inline comments

@@ @@ -301,10 +301,8 @@ ScriptObject::ActiveInstance::~ActiveIns @@
 	/* Are we only interested in the estimate costs? */
 	bool estimate_only = GetDoCommandMode() != NULL && !GetDoCommandMode()();
 #ifdef ENABLE_NETWORK
 	/* Only set p2 when the command does not come from the network. */
 	if (GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = UINT32_MAX;
 #endif
 	/* Try to perform the command. */
 	CommandCost res = ::DoCommandPInternal(tile, p1, p2, cmd, (_networking && !_generating_world) ? ScriptObject::GetActiveInstance()->GetDoCommandCallback() : NULL, text, false, estimate_only);

src/script/script_scanner.cpp

➞

Show inline comments

@@ @@ -18,11 +18,9 @@ @@
 #include "script_scanner.hpp"
 #include "script_info.hpp"
 #if defined(ENABLE_NETWORK)
 #include "../network/network_content.h"
 #include "../3rdparty/md5/md5.h"
 #include "../tar_type.h"
 #endif /* ENABLE_NETWORK */
 #include "../safeguards.h"
@@ @@ -180,8 +178,6 @@ char *ScriptScanner::GetConsoleList(char @@
 	return p;
+}
 #if defined(ENABLE_NETWORK)
 /** Helper for creating a MD5sum of all files within of a script. */
 struct ScriptFileChecksumCreator : FileScanner {
 	byte md5sum[16];  ///< The final md5sum.
@@ @@ -287,5 +283,3 @@ const char *ScriptScanner::FindMainScrip @@
+	}
 	return NULL;
+}
 #endif /* ENABLE_NETWORK */

src/settings.cpp

➞

Show inline comments

@@ @@ -1339,9 +1339,6 @@ static bool InvalidateShipPathCache(int3 @@
 	return true;
+}
 #ifdef ENABLE_NETWORK
 static bool UpdateClientName(int32 p1)
+{
 	NetworkUpdateClientName();
@@ @@ -1373,9 +1370,6 @@ static bool UpdateClientConfigValues(int @@
 	return true;
+}
 #endif /* ENABLE_NETWORK */
 /* End - Callback Functions */
 /**
@@ @@ -1705,11 +1699,9 @@ static void HandleSettingDescs(IniFile * @@
 		proc(ini, _currency_settings,"currency", &_custom_currency);
 		proc(ini, _company_settings, "company",  &_settings_client.company);
 #ifdef ENABLE_NETWORK
 		proc_list(ini, "server_bind_addresses", &_network_bind_list);
 		proc_list(ini, "servers", &_network_host_list);
 		proc_list(ini, "bans",    &_network_ban_list);
 #endif /* ENABLE_NETWORK */
+	}
+}
@@ @@ -2009,7 +2001,6 @@ void SetDefaultCompanySettings(CompanyID @@
+	}
+}
 #if defined(ENABLE_NETWORK)
 /**
  * Sync all company settings in a multiplayer game.
  */
@@ @@ -2025,7 +2016,6 @@ void SyncCompanySettings() @@
 		if (old_value != new_value) NetworkSendCommand(0, i, new_value, CMD_CHANGE_COMPANY_SETTING, NULL, NULL, _local_company);
+	}
+}
 #endif /* ENABLE_NETWORK */
 /**
  * Get the index in the _company_settings array of a setting

src/settings_func.h

➞

Show inline comments

@@ @@ -40,10 +40,6 @@ void DeleteGRFPresetFromConfig(const cha @@
 uint GetCompanySettingIndex(const char *name);
 void SetDefaultCompanySettings(CompanyID cid);
 #if defined(ENABLE_NETWORK)
 void SyncCompanySettings();
 #else /* ENABLE_NETWORK */
 static inline void SyncCompanySettings() {}
 #endif /* ENABLE_NETWORK */
 #endif /* SETTINGS_FUNC_H */

src/settings_type.h

➞

Show inline comments

@@ @@ -154,11 +154,9 @@ struct GUISettings { @@
 	uint8  station_gui_group_order;          ///< the order of grouping cargo entries in the station gui
 	uint8  station_gui_sort_by;              ///< sort cargo entries in the station gui by station name or amount
 	uint8  station_gui_sort_order;           ///< the sort order of entries in the station gui - ascending or descending
 #ifdef ENABLE_NETWORK
 	uint16 network_chat_box_width_pct;       ///< width of the chat box in percent
 	uint8  network_chat_box_height;          ///< height of the chat box in lines
 	uint16 network_chat_timeout;             ///< timeout of chat messages in seconds
 #endif
 	uint8  developer;                        ///< print non-fatal warnings in console (>= 1), copy debug output to console (== 2)
 	bool   show_date_in_logs;                ///< whether to show dates in console logs
@@ @@ -237,7 +235,6 @@ struct NewsSettings { @@
 /** All settings related to the network. */
 struct NetworkSettings {
 #ifdef ENABLE_NETWORK
 	uint16 sync_freq;                                     ///< how often do we check whether we are still in-sync
 	uint8  frame_freq;                                    ///< how often do we send commands to the clients
 	uint16 commands_per_frame;                            ///< how many commands may be sent each frame_freq frames?
@@ @@ -277,8 +274,6 @@ struct NetworkSettings { @@
 	char   last_host[NETWORK_HOSTNAME_LENGTH];            ///< IP address of the last joined server
 	uint16 last_port;                                     ///< port of the last joined server
 	bool   no_http_content_downloads;                     ///< do not do content downloads over HTTP
 #else /* ENABLE_NETWORK */
 #endif
 };
 /** Settings related to the creation of games. */

src/strings.cpp

➞

Show inline comments

@@ @@ -35,9 +35,7 @@ @@
 #include "window_func.h"
 #include "debug.h"
 #include "game/game_text.hpp"
 #ifdef ENABLE_NETWORK
 #	include "network/network_content_gui.h"
 #endif /* ENABLE_NETWORK */
 #include "network/network_content_gui.h"
 #include <stack>
 #include "table/strings.h"
@@ @@ -1681,11 +1679,7 @@ static char *GetSpecialNameString(char * @@
 	NOT_REACHED();
+}
 #ifdef ENABLE_NETWORK
 extern void SortNetworkLanguages();
 #else /* ENABLE_NETWORK */
 static inline void SortNetworkLanguages() {}
 #endif /* ENABLE_NETWORK */
 /**
  * Check whether the header is a valid header for OpenTTD.
@@ @@ -1821,9 +1815,7 @@ bool ReadLanguagePack(const LanguageMeta @@
 	SortIndustryTypes();
 	BuildIndustriesLegend();
 	SortNetworkLanguages();
 #ifdef ENABLE_NETWORK
 	BuildContentTypeStringList();
 #endif /* ENABLE_NETWORK */
 	InvalidateWindowClassesData(WC_BUILD_VEHICLE);      // Build vehicle window.
 	InvalidateWindowClassesData(WC_TRAINS_LIST);        // Train group window.
 	InvalidateWindowClassesData(WC_ROADVEH_LIST);       // Road vehicle group window.

src/table/gameopt_settings.ini

➞

Show inline comments

@@ @@ -21,9 +21,7 @@ static const char *_climates = "temperat @@
 static const char *_autosave_interval = "off|monthly|quarterly|half year|yearly";
 static const char *_roadsides = "left|right";
 static const char *_savegame_date = "long|short|iso";
 #ifdef ENABLE_NETWORK
 static const char *_server_langs = "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN";
 #endif /* ENABLE_NETWORK */
 static const char *_osk_activation = "disabled|double|single|immediately";
 static const char *_settings_profiles = "easy|medium|hard";
 static const char *_news_display = "off|summarized|full";

src/table/settings.ini

➞

Show inline comments

@@ @@ -44,12 +44,11 @@ static bool ZoomMinMaxChanged(int32 p1); @@
 static bool MaxVehiclesChanged(int32 p1);
 static bool InvalidateShipPathCache(int32 p1);
 #ifdef ENABLE_NETWORK
 static bool UpdateClientName(int32 p1);
 static bool UpdateServerPassword(int32 p1);
 static bool UpdateRconPassword(int32 p1);
 static bool UpdateClientConfigValues(int32 p1);
-#endif /* ENABLE_NETWORK */
 /* End - Callback Functions for the various settings */
 /* Some settings do not need to be synchronised when playing in multiplayer.
@@ @@ -3565,7 +3564,6 @@ strhelp = STR_CONFIG_SETTING_NEWS_GENER @@
 strval   = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_width_pct
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3575,7 +3573,6 @@ max = 100 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_height
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3585,7 +3582,6 @@ max = 255 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_timeout
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3595,7 +3591,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.sync_freq
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
@@ @@ -3606,7 +3601,6 @@ max = 100 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.frame_freq
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NOT_IN_CONFIG | SLF_NO_NETWORK_SYNC
@@ @@ -3617,7 +3611,6 @@ max = 100 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.commands_per_frame
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3628,7 +3621,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_commands_in_queue
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3639,7 +3631,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.bytes_per_frame
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3650,7 +3641,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.bytes_per_frame_burst
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3661,7 +3651,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_init_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3672,7 +3661,6 @@ max = 32000 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_join_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3682,7 +3670,6 @@ min = 0 @@
 max      = 32000
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_download_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3692,7 +3679,6 @@ min = 0 @@
 max      = 32000
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_password_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3702,7 +3688,6 @@ min = 0 @@
 max      = 32000
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_lag_time
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3712,14 +3697,12 @@ min = 0 @@
 max      = 32000
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.pause_on_join
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = true
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.server_port
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3730,7 +3713,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.server_admin_port
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3741,7 +3723,6 @@ max = 65535 @@
 cat      = SC_EXPERT
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.server_admin_chat
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
@@ @@ -3749,14 +3730,12 @@ def = true @@
 cat      = SC_EXPERT
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.server_advertise
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.lan_internet
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3766,7 +3745,6 @@ min = 0 @@
 max      = 1
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.client_name
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3774,8 +3752,6 @@ def = NULL @@
 proc     = UpdateClientName
 cat      = SC_BASIC
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.server_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3785,7 +3761,6 @@ proc = UpdateServerPassword @@
 cat      = SC_BASIC
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.rcon_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3795,7 +3770,6 @@ proc = UpdateRconPassword @@
 cat      = SC_BASIC
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.admin_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3804,14 +3778,12 @@ def = NULL @@
 cat      = SC_BASIC
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.default_company_pass
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.server_name
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3820,14 +3792,12 @@ def = NULL @@
 cat      = SC_BASIC
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.connect_to_ip
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = NULL
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.network_id
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3835,14 +3805,12 @@ guiflags = SGF_NETWORK_ONLY @@
 def      = NULL
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_companies
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_unprotected
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3852,7 +3820,6 @@ min = 0 @@
 max      = 240
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_protected
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3862,7 +3829,6 @@ min = 0 @@
 max      = 240
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.autoclean_novehicles
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3872,7 +3838,6 @@ min = 0 @@
 max      = 240
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_companies
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3884,7 +3849,6 @@ proc = UpdateClientConfigValues @@
 cat      = SC_BASIC
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_clients
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3895,7 +3859,6 @@ max = MAX_CLIENTS @@
 cat      = SC_BASIC
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.max_spectators
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3907,7 +3870,6 @@ proc = UpdateClientConfigValues @@
 cat      = SC_BASIC
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.restart_game_year
 type     = SLE_INT32
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3918,7 +3880,6 @@ max = MAX_YEAR @@
 interval = 1
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.min_active_clients
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3928,7 +3889,6 @@ min = 0 @@
 max      = MAX_CLIENTS
 [SDTC_OMANY]
 ifdef    = ENABLE_NETWORK
 var      = network.server_lang
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3939,7 +3899,6 @@ full = _server_langs @@
 cat      = SC_BASIC
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.reload_cfg
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
@@ @@ -3947,7 +3906,6 @@ def = false @@
 cat      = SC_EXPERT
 [SDTC_STR]
 ifdef    = ENABLE_NETWORK
 var      = network.last_host
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3955,7 +3913,6 @@ def = """" @@
 cat      = SC_EXPERT
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = network.last_port
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
@@ @@ -3965,7 +3922,6 @@ max = UINT16_MAX @@
 cat      = SC_EXPERT
 [SDTC_BOOL]
 ifdef    = ENABLE_NETWORK
 var      = network.no_http_content_downloads
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -158,11 +158,9 @@ public: @@
 		int lock_offset = (bottom - top - lock_size.height) / 2;
 		DrawCompanyIcon(company, rtl ? right - this->icon_size.width - WD_FRAMERECT_RIGHT : left + WD_FRAMERECT_LEFT, top + icon_offset);
 #ifdef ENABLE_NETWORK
 		if (NetworkCompanyIsPassworded(company)) {
 			DrawSprite(SPR_LOCK, PAL_NONE, rtl ? left + WD_FRAMERECT_LEFT : right - this->lock_size.width - WD_FRAMERECT_RIGHT, top + lock_offset);
+		}
 #endif
 		SetDParam(0, company);
 		SetDParam(1, company);
@@ @@ -223,7 +221,6 @@ static void PopupMainCompanyToolbMenu(Wi @@
 	switch (widget) {
 		case WID_TN_COMPANIES:
 #ifdef ENABLE_NETWORK
 			if (!_networking) break;
 			/* Add the client list button for the companies menu */
@@ @@ -234,7 +231,6 @@ static void PopupMainCompanyToolbMenu(Wi @@
 			} else {
 				*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_SPECTATE, CTMN_SPECTATE, NetworkMaxSpectatorsReached());
+			}
 #endif /* ENABLE_NETWORK */
 			break;
 		case WID_TN_STORY:
@@ @@ -610,7 +606,6 @@ static CallBackFunction ToolbarCompanies @@
  */
 static CallBackFunction MenuClickCompany(int index)
+{
 #ifdef ENABLE_NETWORK
 	if (_networking) {
 		switch (index) {
 			case CTMN_CLIENT_LIST:
@@ @@ -635,7 +630,6 @@ static CallBackFunction MenuClickCompany @@
 				return CBF_NONE;
+		}
+	}
 #endif /* ENABLE_NETWORK */
 	ShowCompany((CompanyID)index);
 	return CBF_NONE;
+}
@@ @@ -2076,9 +2070,7 @@ struct MainToolbarWindow : Window { @@
 			case MTHK_CHEATS: if (!_networking) ShowCheatWindow(); break;
 			case MTHK_TERRAFORM: ShowTerraformToolbar(); break;
 			case MTHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break;
 #ifdef ENABLE_NETWORK
 			case MTHK_CLIENT_LIST: if (_networking) ShowClientList(); break;
 #endif
 			case MTHK_SIGN_LIST: ShowSignList(); break;
 			default: return ES_NOT_HANDLED;
+		}
@@ @@ -2189,9 +2181,7 @@ static Hotkey maintoolbar_hotkeys[] = { @@
 	Hotkey(WKC_CTRL | WKC_ALT | 'C', "cheats", MTHK_CHEATS),
 	Hotkey('L', "terraform", MTHK_TERRAFORM),
 	Hotkey('V', "extra_viewport", MTHK_EXTRA_VIEWPORT),
 #ifdef ENABLE_NETWORK
 	Hotkey((uint16)0, "client_list", MTHK_CLIENT_LIST),
 #endif
 	Hotkey((uint16)0, "sign_list", MTHK_SIGN_LIST),
 	HOTKEY_LIST_END
 };

src/video/dedicated_v.cpp

➞

Show inline comments

@@ @@ -11,8 +11,6 @@ @@
 #include "../stdafx.h"
 #ifdef ENABLE_NETWORK
 #include "../gfx_func.h"
 #include "../network/network.h"
 #include "../network/network_internal.h"
@@ @@ -316,5 +314,3 @@ void VideoDriver_Dedicated::MainLoop() @@
+		}
+	}
+}
 #endif /* ENABLE_NETWORK */

src/viewport.cpp

➞

Show inline comments

@@ @@ -3318,12 +3318,8 @@ CommandCost CmdScrollViewport(TileIndex @@
 			if (_local_company != (CompanyID)p2) return CommandCost();
 			break;
 		case VST_CLIENT:
 #ifdef ENABLE_NETWORK
 			if (_network_own_client_id != (ClientID)p2) return CommandCost();
 			break;
 #else
 			return CommandCost();
 #endif
 		default:
 			return CMD_ERROR;
+	}

src/window.cpp

➞

Show inline comments

@@ @@ -3120,13 +3120,11 @@ void UpdateWindows() @@
 	CallWindowRealtimeTickEvent(delta_ms);
 #ifdef ENABLE_NETWORK
 	static GUITimer network_message_timer = GUITimer(1);
 	if (network_message_timer.Elapsed(delta_ms)) {
 		network_message_timer.SetInterval(1000);
 		NetworkChatMessageLoop();
+	}
 #endif
 	Window *w;
@@ @@ -3443,10 +3441,9 @@ void ReInitAllWindows() @@
 	FOR_ALL_WINDOWS_FROM_BACK(w) {
 		w->ReInit();
+	}
-#ifdef ENABLE_NETWORK
 	void NetworkReInitChatBoxSize();
 	NetworkReInitChatBoxSize();
 #endif
 	/* Make sure essential parts of all windows are visible */
 	RelocateAllWindows(_cur_resolution.width, _cur_resolution.height);

0 comments (0 inline, 0 general)