define idle controller

wesnoth · Feb 21, 2014 · 04a4ec3 · 04a4ec3
1 parent 25c1a9b
commit 04a4ec3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/team.cpp b/src/team.cpp
@@ -227,6 +227,7 @@ char const *team::team_info::controller_string() const
 	case HUMAN_AI: return "human_ai";
 	case NETWORK: return "network";
 	case NETWORK_AI: return "network_ai";
+	case IDLE: return "idle";
 	case EMPTY: return "null";
 	default: assert(false); return NULL;
 	}
@@ -498,6 +499,8 @@ void team::change_controller(const std::string& controller)
 		cid = team::NETWORK_AI;
 	else if (controller == "null")
 		cid = team::EMPTY;
+	else if (controller == "idle")
+		cid = team::IDLE;
 	else
 		cid = team::AI;
 

diff --git a/src/team.hpp b/src/team.hpp
@@ -32,7 +32,7 @@ namespace wb {
 class team : public savegame::savegame_config
 {
 public:
-	enum CONTROLLER { HUMAN, HUMAN_AI, AI, NETWORK, NETWORK_AI, EMPTY };
+	enum CONTROLLER { HUMAN, HUMAN_AI, AI, NETWORK, NETWORK_AI, IDLE, EMPTY };
 
 private:
 	class shroud_map {
@@ -210,6 +210,7 @@ class team : public savegame::savegame_config
 	bool is_network_human() const { return info_.controller == NETWORK; }
 	bool is_network_ai() const { return info_.controller == NETWORK_AI; }
 	bool is_ai() const { return info_.controller == AI || is_human_ai(); }
+	bool is_idle() const { return info_.controller == IDLE; }
 	bool is_empty() const { return info_.controller == EMPTY; }
 
 	bool is_local() const { return is_human() || is_ai(); }
@@ -220,6 +221,7 @@ class team : public savegame::savegame_config
 	void make_network() { info_.controller = NETWORK; }
 	void make_network_ai() { info_.controller = NETWORK_AI; }
 	void make_ai() { info_.controller = AI; }
+	void make_idle() { info_.controller = IDLE; }
 	void change_controller(const std::string& controller);
 	void change_controller(CONTROLLER controller) { info_.controller = controller; }