From e77e738b0ccaa8a66267055631c7086797a62212 Mon Sep 17 00:00:00 2001
From: Dave White <davewx7@gmail.com>
Date: Thu, 13 Nov 2003 22:00:05 +0000
Subject: [PATCH] made it so if client_type=ai is in preferences file, ...

...the player will join networked games as an AI
---
 src/multiplayer_client.cpp | 2 +-
 src/preferences.cpp        | 8 ++++++++
 src/preferences.hpp        | 2 ++
 src/server/server.cpp      | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/multiplayer_client.cpp b/src/multiplayer_client.cpp
index 4f28b5427f6..2aeb7c4f3e2 100644
--- a/src/multiplayer_client.cpp
+++ b/src/multiplayer_client.cpp
@@ -344,7 +344,7 @@ void play_multiplayer_client(display& disp, game_data& units_data, config& cfg,
 			    side != sides_list.end(); ++side) {
 				string_map& values = (*side)->values;
 				if(team_num-1 == side - sides_list.begin())
-					values["controller"] = "human";
+					values["controller"] = preferences::client_type();
 				else
 					values["controller"] = "network";
 			}
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 6ae4c978b1f..ff9541a96e8 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -313,6 +313,14 @@ bool show_ai_moves()
 	return prefs["show_ai_moves"] != "no";
 }
 
+std::string client_type()
+{
+	if(prefs["client_type"] == "ai")
+		return "ai";
+	else
+		return "human";
+}
+
 void show_preferences_dialog(display& disp)
 {
 	const events::resize_lock prevent_resizing;
diff --git a/src/preferences.hpp b/src/preferences.hpp
index 944e16738ea..45ce7f85f73 100644
--- a/src/preferences.hpp
+++ b/src/preferences.hpp
@@ -74,6 +74,8 @@ namespace preferences {
 
 	bool show_ai_moves();
 
+	std::string client_type();
+
 	void show_preferences_dialog(display& disp);
 	void show_video_mode_dialog(display& disp);
 }
diff --git a/src/server/server.cpp b/src/server/server.cpp
index b06278721cc..3b82fe291e0 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -341,5 +341,6 @@ int main()
 		run_server();
 	} catch(network::error& e) {
 		std::cerr << "error starting server: " << e.message << "\n";
+		return -1;
 	}
 }