Revert 2011-12-16T04:06:47Z!Majora700@gmail.com, 2011-12-16T04:08:22Z!Majora700@gmail.com and 2011-12-16T04:14:58Z!Majora700@gmail.com.

1. The internal type is a std::string, the lua getters/setters should
reflect that like all the existing ones already do instead of making
implicit conversions.

2. It doesn't make sense to convert the already translated string
into a t_string again upon getting it.

3. The setter in team.cpp you added is redundant.

4. The attribute is apparently not really meant to be modified
by lua or wml so a tag is no good idea.

data/campaigns/tutorial/scenarios/1_Tutorial.cfg

@@ -195,10 +195,6 @@ Recruiting"
                         name= _"Li’sar"
                         canrecruit=yes
                     [/unit]
-                    [modify_side]
-                        side=1
-                        current_player= _"Li’sar"
-                    [/modify_side]
                     [redraw][/redraw]
                 [/command]
             [/option]

data/campaigns/tutorial/scenarios/2_Tutorial.cfg

@@ -412,10 +412,6 @@
                 equals=female
             [/variable]
             [then]
-                [modify_side]
-                    side=1
-                    current_player= _"Li’sar"
-                [/modify_side]
                 [store_unit]
                     [filter]
                         id=student

src/game_events.cpp

@@ -953,7 +953,6 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
 
 	std::string team_name = cfg["team_name"];
 	std::string user_team_name = cfg["user_team_name"];
-	std::string current_player = cfg["current_player"];
 	std::string controller = cfg["controller"];
 	std::string recruit_str = cfg["recruit"];
 	std::string shroud_data = cfg["shroud_data"];
@@ -981,10 +980,6 @@ WML_HANDLER_FUNCTION(modify_side, /*event_info*/, cfg)
 			teams[team_index].change_team(teams[team_index].team_name(),
 					user_team_name);
 		}
-		if (!current_player.empty()) {
-			LOG_NG << "change side's current_player to '" << current_player << "'\n";
-			teams[team_index].set_current_player(current_player);
-		}
 		// Modify recruit list (override)
 		if (!recruit_str.empty()) {
 			std::vector<std::string> recruit = utils::split(recruit_str);

src/scripting/lua.cpp

@@ -1552,7 +1552,7 @@ static int impl_side_get(lua_State *L)
 	return_string_attrib("name", t.name());
 	return_string_attrib("color", t.map_color_to());
 	return_cstring_attrib("controller", t.controller_string());
-	return_tstring_attrib("current_player", t.current_player());
+	return_string_attrib("current_player", t.current_player());
 
 	if (strcmp(m, "recruit") == 0) {
 		std::set<std::string> const &recruits = t.recruits();
@@ -1591,7 +1591,7 @@ static int impl_side_set(lua_State *L)
 	modify_tstring_attrib("user_team_name", t.change_team(t.team_name(), value));
 	modify_string_attrib("team_name", t.change_team(value, t.user_team_name()));
 	modify_string_attrib("controller", t.change_controller(value));
-	modify_tstring_attrib("current_player", t.set_current_player(value));
+	modify_string_attrib("current_player", t.set_current_player(value));
 
 	if (strcmp(m, "recruit") == 0) {
 		t.set_recruits(std::set<std::string>());

src/team.cpp

@@ -495,12 +495,6 @@ void team::change_team(const std::string &name, const t_string &user_name)
 	clear_caches();
 }
 
-void team::set_current_player(const t_string &current_player)
-{
-	info_.current_player = current_player;
-	clear_caches();
-}
-
 void team::clear_caches(){
 	// Reset the cache of allies for all teams
 	if(teams != NULL) {

src/team.hpp

@@ -223,7 +223,6 @@ public:
 	const std::string& team_name() const { return info_.team_name; }
 	const t_string &user_team_name() const { return info_.user_team_name; }
 	void change_team(const std::string &name, const t_string &user_name);
-	void set_current_player(const t_string &current_player);
 
 	const std::string& flag() const { return info_.flag; }
 	const std::string& flag_icon() const { return info_.flag_icon; }