upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 20:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify a conditional.

Browse Source
This commit is contained in:
J. Tyne 2012-08-21 22:52:17 +00:00
parent 1b22ced556
commit 592e1fff6e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map.cpp
View File

@ -560,12 +560,9 @@ bool gamemap::on_board(const map_location& loc) const
bool gamemap::on_board_with_border(const map_location& loc) const
{
if(tiles_.empty()) {
return false;
} else {
return loc.x >= (0 - border_size_) && loc.x < (w_ + border_size_) &&
loc.y >= (0 - border_size_) && loc.y < (h_ + border_size_);
}
return !tiles_.empty() &&
loc.x >= -border_size_ && loc.x < w_ + border_size_ &&
loc.y >= -border_size_ && loc.y < h_ + border_size_;
}
const terrain_type& gamemap::get_terrain_info(const t_translation::t_terrain terrain) const