0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bug with drawing tiles

Browse source
This commit is contained in:
Dave White 2003-11-14 20:41:42 +00:00
parent 68566c34e2
commit 431c29f430
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/display.cpp
View file

@ -375,12 +375,10 @@ void display::bounds_check_position()
if(zoom_ < min_zoom) { if(zoom_ < min_zoom) {
zoom_ = min_zoom; zoom_ = min_zoom;
image::set_zoom(zoom_);
} }
if(zoom_ > max_zoom) { if(zoom_ > max_zoom) {
zoom_ = max_zoom; zoom_ = max_zoom;
image::set_zoom(zoom_);
} }
const double xend = zoom_*map_.x()*0.75 + zoom_*0.25; 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"; image += direction + ".png";
SDL_Surface* im = image::get_image(image,image_type); SDL_Surface* im = image::get_image(image,image_type);
if(im == NULL) { if(im == NULL && direction.empty()) {
im = image::get_image("terrain/" + im = image::get_image("terrain/" +
map_.get_terrain_info(terrain).default_image() + ".png"); map_.get_terrain_info(terrain).default_image() + ".png");
} }

3
src/multiplayer.cpp
View file

@ -419,7 +419,8 @@ void play_multiplayer(display& disp, game_data& units_data, config cfg,
} else if(result < int(choices.size()/3)*2) { } else if(result < int(choices.size()/3)*2) {
controller = "ai"; controller = "ai";
result -= choices.size()/3; result -= choices.size()/3;
sides[res]->values["description"] = ""; sides[res]->values["description"] =
string_table["ai_controlled"];
} else { } else {
controller = "network"; controller = "network";
result -= (choices.size()/3)*2; result -= (choices.size()/3)*2;