fixed seg fault bug
This commit is contained in:
parent
3147460662
commit
194fdb5a00
2 changed files with 7 additions and 5 deletions
|
@ -366,13 +366,15 @@ void display::bounds_check_position()
|
|||
|
||||
zoom_ = floor(zoom_);
|
||||
|
||||
if(zoom_ < min_zoom)
|
||||
if(zoom_ < min_zoom) {
|
||||
zoom_ = min_zoom;
|
||||
image::set_zoom(zoom_);
|
||||
}
|
||||
|
||||
if(zoom_ > max_zoom)
|
||||
if(zoom_ > max_zoom) {
|
||||
zoom_ = max_zoom;
|
||||
|
||||
image::set_zoom(zoom_);
|
||||
image::set_zoom(zoom_);
|
||||
}
|
||||
|
||||
const double xend = zoom_*map_.x()*0.75 + zoom_*0.25;
|
||||
const double yend = zoom_*map_.y() + zoom_/2.0;
|
||||
|
|
|
@ -344,7 +344,7 @@ void play_multiplayer_client(display& disp, game_data& units_data, config& cfg,
|
|||
side != sides_list.end(); ++side) {
|
||||
string_map& values = (*side)->values;
|
||||
if(team_num-1 == side - sides_list.begin())
|
||||
values["controller"] = "human";
|
||||
values["controller"] = "ai";
|
||||
else
|
||||
values["controller"] = "network";
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue