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

Fixed bug #18668...

Browse source 
([time_area] causes seq fault which was due to grabbing a
non-exitent token from utils::split_attr)
This commit is contained in:
Thonsew 2011-09-22 11:31:41 +00:00
parent e5b7d38777
commit 1d35e71bf6
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game_events.cpp
View file

@ -3083,13 +3083,9 @@ WML_HANDLER_FUNCTION(time_area, /*event_info*/, cfg)
}
else {
config::t_token id;
id = utils::split_attr(ids,',',utils::STRIP_SPACES | utils::REMOVE_EMPTY).front();
// if(ids.find(',') != std::string::npos) {
// id = utils::split_token(ids,',',utils::STRIP_SPACES | utils::REMOVE_EMPTY).front();
// ERR_NG << "multiple ids for inserting a new time_area; will use only the first\n";
// } else {
// id = ids;
// }
std::vector<config::t_token> idsv = utils::split_attr(ids,',',utils::STRIP_SPACES | utils::REMOVE_EMPTY);
id = (idsv.empty()) ? ids.token() : idsv.front();
map_location::t_maploc_set locs;
terrain_filter filter(cfg, *resources::units);
filter.restrict_size(game_config::max_loop);