Author: crab
Date: Wed Apr 1 01:39:10 2009
New Revision: 34365
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34365&view=rev
Log:
Renamed redeploy_ai_from_location to switch_ai in [modify_side]
Modified:
trunk/data/ai/scenarios/scenario-AI_Arena_small.cfg
trunk/src/game_events.cpp
Modified: trunk/data/ai/scenarios/scenario-AI_Arena_small.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/ai/scenarios/scenario-AI_Arena_small.cfg?rev=34365&r1=34364&r2=34365&view=diff
==============================================================================
--- trunk/data/ai/scenarios/scenario-AI_Arena_small.cfg (original)
+++ trunk/data/ai/scenarios/scenario-AI_Arena_small.cfg Wed Apr 1 01:39:10 2009
@@ -528,7 +528,7 @@
[modify_side]
side=3
gold=10000
- redeploy_ai_from_location=$test_path_to_idle_ai
+ switch_ai=$test_path_to_idle_ai
[/modify_side]
[/case]
[else]
@@ -546,7 +546,7 @@
first_time_only=no
[modify_side]
side=2
- redeploy_ai_from_location=$test_path_to_ai
+ switch_ai=$test_path_to_ai
[/modify_side]
[message]
speaker=narrator
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=34365&r1=34364&r2=34365&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Wed Apr 1 01:39:10 2009
@@ -800,10 +800,7 @@
* @todo also allow client to modify a side's colour if it is
possible
* to change it on the fly without causing visual glitches
*/
- /**
- * @todo: rename this attribute and document it
- */
- std::string redeploy_ai_from_location =
cfg["redeploy_ai_from_location"];
+ std::string switch_ai = cfg["switch_ai"];
assert(state_of_game != NULL);
const int side_num = lexical_cast_default<int>(side,1);
@@ -864,9 +861,8 @@
(*teams)[team_index].set_ai_parameters(ai);
}
// Redeploy ai from location (this ignores current AI
parameters)
- // @todo: this is probably SP-only and on human turn
only
- if (!redeploy_ai_from_location.empty()) {
-
ai_manager::add_ai_for_team_from_file(side_num,redeploy_ai_from_location);
+ if (!switch_ai.empty()) {
+
ai_manager::add_ai_for_team_from_file(side_num,switch_ai);
}
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
