fixed bug where Blackwater Port was easier than it was meant to be ...

...on 'normal' level

data/scenarios/Blackwater_Port.cfg

@@ -90,15 +90,7 @@ Defeat:
 	canrecruit=1
 	team_name=orcs
 	recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp
-#ifdef HARD
-	gold=400
-#endif
-#ifdef MEDIUM
-	gold=320
-#endif
-#ifdef EASY
-	gold=140
-#endif
+	{GOLD 140 320 400}
 	[/side]
 
 	[event]

src/editor/editor.cpp

@@ -78,6 +78,7 @@ int main(int argc, char** argv)
 
 	preproc_map defines_map;
 	defines_map["MEDIUM"] = preproc_define();
+	defines_map["NORMAL"] = preproc_define();
 	config cfg(preprocess_file("data/game.cfg",&defines_map));
 
 	set_language("English", cfg);

src/game.cpp

@@ -503,6 +503,12 @@ int play_game(int argc, char** argv)
 				state.difficulty = difficulties[res];
 				defines_map.clear();
 				defines_map[difficulties[res]] = preproc_define();
+
+				//lots of people seem to get 'NORMAL' and 'MEDIUM' mixed up,
+				//so we make it that if it's NORMAL, MEDIUM is also accepted
+				if(difficulties[res] == "NORMAL") {
+					defines_map["MEDIUM"] = preproc_define();
+				}
 			}
 		} else if(res == gui::MULTIPLAYER) {
 			state.campaign_type = "multiplayer";

src/preferences.cpp

@@ -131,7 +131,6 @@ void set_resolution(const std::pair<int,int>& resolution)
 		if(video.modePossible(res.first,res.second,16,flags)) {
 
 			video.setMode(res.first,res.second,16,flags);
-
 			disp->redraw_everything();
 
 			char buf[50];

src/widgets/slider.cpp

@@ -26,7 +26,7 @@ namespace {
 namespace gui {
 
 slider::slider(display& d, SDL_Rect& rect)
-	: widget(d, rect), highlight_(false), clicked_(true),
+	: widget(d, rect), min_(-100000), max_(100000), value_(0), highlight_(false), clicked_(true),
 	  dragging_(false)
 {
 	set_dirty(true);