0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made it so teleporting units would re-clear shroud/fog (resolved bug #8700

Browse source
This commit is contained in:
Dave White 2004-04-26 15:55:59 +00:00
parent d536ee72d4
commit 01a79b1949
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game_events.cpp
View file

@ -149,6 +149,7 @@ std::map<gamemap::location,unit>* units = NULL;
std::vector<team>* teams = NULL;
game_state* state_of_game = NULL;
game_data* game_data_ptr = NULL;
gamestatus* status_ptr = NULL;
std::set<std::string> used_items;
bool events_init() { return screen != NULL; }
@ -261,10 +262,14 @@ bool event_handler::handle_event_command(const queued_event& event_info, const s
if(game_map->on_board(dst)) {
const gamemap::location vacant_dst = find_vacant_tile(*game_map,*units,dst);
if(game_map->on_board(vacant_dst)) {
const int side = u->second.side();
//note that inserting into a map does NOT invalidate iterators
//into the map, so this sequence is fine.
units->insert(std::pair<gamemap::location,unit>(vacant_dst,u->second));
units->erase(u);
clear_shroud(*screen,*status_ptr,*game_map,*game_data_ptr,*units,*teams,side-1);
}
}
}
@ -1074,7 +1079,7 @@ void set_variable(const std::string& key, const std::string& value)
manager::manager(config& cfg, display& gui_, gamemap& map_,
std::map<gamemap::location,unit>& units_,
std::vector<team>& teams_,
game_state& state_of_game_, game_data& game_data_)
game_state& state_of_game_, gamestatus& status, game_data& game_data_)
{
const config::child_list& events_list = cfg.get_children("event");
for(config::child_list::const_iterator i = events_list.begin();
@ -1090,6 +1095,7 @@ manager::manager(config& cfg, display& gui_, gamemap& map_,
units = &units_;
state_of_game = &state_of_game_;
game_data_ptr = &game_data_;
status_ptr = &status;
used_items.clear();
const std::string& used = cfg["used_items"];
@ -1131,6 +1137,7 @@ manager::~manager() {
units = NULL;
state_of_game = NULL;
game_data_ptr = NULL;
status_ptr = NULL;
}
void raise(const std::string& event,

2
src/game_events.hpp
View file

@ -49,7 +49,7 @@ struct manager {
//for the life of the object.
manager(config& scenario_cfg, display& disp, gamemap& map,
std::map<gamemap::location,unit>& units, std::vector<team>& teams,
game_state& state_of_game, game_data& data);
game_state& state_of_game, gamestatus& status, game_data& data);
~manager();
};

2
src/playlevel.cpp
View file

@ -299,7 +299,7 @@ LEVEL_RESULT play_level(game_data& gameinfo, const config& game_config,
(*level)["victory_when_enemies_defeated"] != "no");
game_events::manager events_manager(*level,gui,map,units,teams,
state_of_game,gameinfo);
state_of_game,status,gameinfo);
//find a list of 'items' (i.e. overlays) on the level, and add them
const config::child_list& overlays = level->get_children("item");