Author: shadowmaster
Date: Sun Oct 16 18:43:17 2011
New Revision: 51514
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51514&view=rev
Log:
Remove some previous asymmetric behavior kept (not introduced) in r51513
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.
Modified:
trunk/src/about.cpp
Modified: trunk/src/about.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/about.cpp?rev=51514&r1=51513&r2=51514&view=diff
==============================================================================
--- trunk/src/about.cpp (original)
+++ trunk/src/about.cpp Sun Oct 16 18:43:17 2011
@@ -183,12 +183,20 @@
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);
- }
- surface map_image(scale_surface(image::get_image(image_list[0]),
screen->w, screen->h));
- if(! map_image){
+ image_list = utils::parenthetical_split(images[campaign], ',');
+ } else{
+ image_list = utils::parenthetical_split(images_default, ',');
+ }
+
+ 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));
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
