From 431c29f430a19e7a86acdbe1bc36f4df2c834550 Mon Sep 17 00:00:00 2001 From: Dave White Date: Fri, 14 Nov 2003 20:41:42 +0000 Subject: [PATCH] fixed bug with drawing tiles --- src/display.cpp | 4 +--- src/multiplayer.cpp | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/display.cpp b/src/display.cpp index 04a35d15cf5..d4785e0a206 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -375,12 +375,10 @@ void display::bounds_check_position() if(zoom_ < min_zoom) { zoom_ = min_zoom; - image::set_zoom(zoom_); } if(zoom_ > max_zoom) { zoom_ = max_zoom; - image::set_zoom(zoom_); } const double xend = zoom_*map_.x()*0.75 + zoom_*0.25; @@ -1449,7 +1447,7 @@ SDL_Surface* display::getTerrain(gamemap::TERRAIN terrain,image::TYPE image_type image += direction + ".png"; SDL_Surface* im = image::get_image(image,image_type); - if(im == NULL) { + if(im == NULL && direction.empty()) { im = image::get_image("terrain/" + map_.get_terrain_info(terrain).default_image() + ".png"); } diff --git a/src/multiplayer.cpp b/src/multiplayer.cpp index d039edd8ea3..166f3168704 100644 --- a/src/multiplayer.cpp +++ b/src/multiplayer.cpp @@ -419,7 +419,8 @@ void play_multiplayer(display& disp, game_data& units_data, config cfg, } else if(result < int(choices.size()/3)*2) { controller = "ai"; result -= choices.size()/3; - sides[res]->values["description"] = ""; + sides[res]->values["description"] = + string_table["ai_controlled"]; } else { controller = "network"; result -= (choices.size()/3)*2;