7 files changed, 0 insertions, 40 deletions
diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp
index f66d9fc8a..7a0fe627a 100644
--- a/src/script/api/script_admin.cpp
+++ b/src/script/api/script_admin.cpp
@@ -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;
diff --git a/src/script/api/script_client.cpp b/src/script/api/script_client.cpp
index 771a0ae4e..855ad86a0 100644
--- a/src/script/api/script_client.cpp
+++ b/src/script/api/script_client.cpp
@@ -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(ScriptClient::ClientID client)
 	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
 }
diff --git a/src/script/api/script_clientlist.cpp b/src/script/api/script_clientlist.cpp
index 2f7a19a9f..dbbbce0ec 100644
--- a/src/script/api/script_clientlist.cpp
+++ b/src/script/api/script_clientlist.cpp
@@ -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::ScriptClientList_Company(ScriptCompany::CompanyID comp
 	FOR_ALL_CLIENT_INFOS(ci) {
 		if (ci->client_playas == c) this->AddItem(ci->client_id);
 	}
-#endif
 }
diff --git a/src/script/api/script_game.cpp b/src/script/api/script_game.cpp
index c24757a3c..3e2617488 100644
--- a/src/script/api/script_game.cpp
+++ b/src/script/api/script_game.cpp
@@ -39,9 +39,5 @@
 
 /* static */ bool ScriptGame::IsMultiplayer()
 {
-#ifdef ENABLE_NETWORK
 	return _network_server;
-#else
-	return false;
-#endif
 }
diff --git a/src/script/api/script_goal.cpp b/src/script/api/script_goal.cpp
index c183b7583..54312cd9d 100644
--- a/src/script/api/script_goal.cpp
+++ b/src/script/api/script_goal.cpp
@@ -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)
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index 49dba6bb7..7a22e3ab7 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -301,10 +301,8 @@ ScriptObject::ActiveInstance::~ActiveInstance()
 	/* 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);
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index fe6d41cf9..168a852a5 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -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 *p, const char *last, bool newest_only)
 	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::FindMainScript(const ContentInfo *ci, bool md5sum)
 	}
 	return NULL;
 }
-
-#endif /* ENABLE_NETWORK */