Author: crab
Date: Sat Apr 11 17:16:51 2009
New Revision: 34719
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34719&view=rev
Log:
AI Refactoring: removed unused turn_data_ from ai_interface::info
Modified:
trunk/src/ai_interface.hpp
trunk/src/menu_events.cpp
trunk/src/playsingle_controller.cpp
Modified: trunk/src/ai_interface.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_interface.hpp?rev=34719&r1=34718&r2=34719&view=diff
==============================================================================
--- trunk/src/ai_interface.hpp (original)
+++ trunk/src/ai_interface.hpp Sat Apr 11 17:16:51 2009
@@ -50,9 +50,9 @@
*/
struct info {
info(game_display& disp, gamemap& map, unit_map& units,
- std::vector<team>& teams, gamestatus& state, class
turn_info& turn_data, class game_state& game_state)
+ std::vector<team>& teams, gamestatus& state, class
game_state& game_state)
: disp(disp), map(map), units(units), teams(teams),
- state(state), turn_data_(turn_data),
game_state_(game_state)
+ state(state), game_state_(game_state)
{}
/** The display object, used to draw the moves the AI makes. */
@@ -69,12 +69,6 @@
/** Information about what turn it is, and what time of day. */
gamestatus& state;
-
- /**
- * The object that allows the player to interact with the game.
Should
- * not be used outside of ai_interface.
- */
- class turn_info& turn_data_;
/** The global game state, because we may set the completion
field. */
class game_state& game_state_;
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=34719&r1=34718&r2=34719&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sat Apr 11 17:16:51 2009
@@ -2969,8 +2969,7 @@
replay_network_sender dummy_sender(dummy_replay);
undo_list dummy_undo;
- turn_info turn_data(gamestate_, status_, *gui_,
const_cast<gamemap&>(map_), teams_, team_num, units_, dummy_sender, dummy_undo);
- ai_interface::info info(*gui_, const_cast<gamemap&>(map_),
units_, teams_, const_cast<gamestatus&>(status_), turn_data, gamestate_);
+ ai_interface::info info(*gui_, const_cast<gamemap&>(map_),
units_, teams_, const_cast<gamestatus&>(status_), gamestate_);
try {
add_chat_message(time(NULL), _("ai"), 0,
ai_manager::evaluate_command(info, team_num, str));
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=34719&r1=34718&r2=34719&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Sat Apr 11 17:16:51 2009
@@ -61,6 +61,7 @@
LOG_NG << "Setting linger mode.\n";
browse_ = linger_ = true;
}
+
}
@@ -818,7 +819,7 @@
turn_info turn_data(gamestate_,status_,*gui_,
map_, teams_, player_number_, units_, replay_sender_,
undo_stack_);
- ai_interface::info ai_info(*gui_,map_,units_,teams_,status_, turn_data,
gamestate_);
+ ai_interface::info ai_info(*gui_,map_,units_,teams_,status_,
gamestate_);
try {
ai_manager::play_turn(player_number_, ai_info, this);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
