diff --git a/src/display.cpp b/src/display.cpp index dee35405333..a8d8592607b 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -691,7 +691,7 @@ void display::draw_unit_details(int x, int y, const gamemap::location& loc, y += description_rect.h; - SDL_Surface* const profile = getImage(u.type().image_profile(),UNSCALED); + SDL_Surface* const profile = getImage(u.type().image(),UNSCALED); if(profile == NULL) return; diff --git a/src/preferences.cpp b/src/preferences.cpp index 4c3879a3347..337ebd58e6f 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -229,7 +229,7 @@ double get_scroll_speed() first_time = false; const string_map::const_iterator itor = prefs.values.find("scroll"); if(itor != prefs.values.end()) { - scroll = maximum(1.0,minimum(0.0, + scroll = minimum(1.0,maximum(0.0, atof(itor->second.c_str()))); } }