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

Remove some previous asymmetric behavior kept (not introduced) in 2011-10-16T16:26:07Z!shadowm@wesnoth.org

Browse source 
The behavior in question was apparently put in place to avoid a
segmentation fault due to unchecked access to a vector's first element;
ensure there'll always be a first element instead.
This commit is contained in:
Ignacio R. Morelle 2011-10-16 16:43:17 +00:00
parent 75920c02ce
commit b0e6c09d23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/about.cpp
View file

@ -183,12 +183,20 @@ void show_about(display &disp, const std::string &campaign)
std::vector<std::string> image_list;
if(campaign.size() && !images[campaign].empty()){
image_list=utils::parenthetical_split(images[campaign], ',', "(", ")");
}else{
image_list=utils::parenthetical_split(images_default, ',', "(", ")", utils::STRIP_SPACES);
image_list = utils::parenthetical_split(images[campaign], ',');
} else{
image_list = utils::parenthetical_split(images_default, ',');
}
surface map_image(scale_surface(image::get_image(image_list[0]), screen->w, screen->h));
if(! map_image){
surface map_image;
if(!image_list.empty()) {
map_image = scale_surface(image::get_image(image_list[0]), screen->w, screen->h);
} else {
image_list.push_back("");
}
if(!map_image){
image_list[0]=game_config::images::game_title;
map_image=surface(scale_surface(image::get_image(image_list[0]), screen->w, screen->h));
}