fixed crash in maps with fog of war

data/scenarios/Mountain_Pass.cfg

@@ -192,6 +192,7 @@ Defeat:
 		y=1-7
 		[/filter]
 		[endlevel]
+		bonus=yes
 		result=victory
 		[/endlevel]
 	[/event]

src/game.cpp

@@ -385,6 +385,7 @@ int play_game(int argc, char** argv)
 
 			std::string scenario = "multiplayer_test";
 			std::map<int,std::string> side_types, side_controllers, side_algorithms;
+			std::map<int,string_map> side_parameters;
 
 			int sides_counted = 0;
 
@@ -395,7 +396,10 @@ int play_game(int argc, char** argv)
 				}
 
 				std::vector<std::string> name_value = config::split(val,'=');
-				if(name_value.size() == 2) {
+				if(name_value.size() > 2) {
+					std::cerr << "invalid argument '" << val << "'\n";
+					return 0;
+				} else if(name_value.size() == 2) {
 					const std::string name = name_value.front();
 					const std::string value = name_value.back();
 
@@ -417,6 +421,14 @@ int play_game(int argc, char** argv)
 						side_algorithms[side] = value;
 					} else if(last_digit && name_head == "--side") {
 						side_types[side] = value;
+					} else if(last_digit && name_head == "--parm") {
+						const std::vector<std::string> name_value = config::split(value,':');
+						if(name_value.size() != 2) {
+							std::cerr << "argument to '" << name << "' must be in the format name:value\n";
+							return 0;
+						}
+
+						side_parameters[side][name_value.front()] = name_value.back();						
 					} else {
 						std::cerr << "unrecognized option: '" << name << "'\n";
 						return 0;
@@ -479,6 +491,11 @@ int play_game(int argc, char** argv)
 				if(algorithm != side_algorithms.end()) {
 					(*itors.first)->values["ai_algorithm"] = algorithm->second;
 				}
+
+				//now add in any arbitrary parameters given to the side
+				for(string_map::const_iterator j = side_parameters[side_num].begin(); j != side_parameters[side_num].end(); ++j) {
+					(*itors.first)->values[j->first] = j->second;
+				}
 			}
 
 			try {

src/image.cpp

@@ -285,7 +285,7 @@ SDL_Surface* getMinimap(int w, int h, const gamemap& map,
 					assert(surf != NULL);
 					
 					SDL_Rect maprect = {x*scale*0.75,y*scale + (is_odd(x) ? scale/2 : 0),0,0};
-					SDL_BlitSurface(surf, NULL, minimap, &maprect);
+					sdl_safe_blit(surf, NULL, minimap, &maprect);
 				}
 			}
 		}