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

convert the border tiles to the new off map types.

Browse source 
This is step 1 to change to the new background
This commit is contained in:
Mark de Wever 2007-05-27 11:17:21 +00:00
parent fbabe2290b
commit 44ba825a09
1 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/map.cpp
View file

@ -422,11 +422,48 @@ void gamemap::overlay(const gamemap& m, const config& rules_cfg, const int xpos,
}
}
// loc the location
// w the width of the map in hexes
// h the height of the map in hexes
static t_translation::t_letter get_border_terrain(const gamemap::location& loc,
const int w, const int h)
{
if(loc.x == 0) {
if(loc.y == 0) return t_translation::OFF_MAP_BORDER_TOP_LEFT;
if(loc.y == h) return t_translation::OFF_MAP_BORDER_TOP_RIGHT;
return t_translation::OFF_MAP_BORDER_TOP;
}
if(loc.x == w) {
if(loc.y == 0) return t_translation::OFF_MAP_BORDER_BOTTOM_LEFT;
if(loc.y == h) return t_translation::OFF_MAP_BORDER_BOTTOM_RIGHT;
return t_translation::OFF_MAP_BORDER_BOTTOM;
}
if(loc.y == 0) return t_translation::OFF_MAP_BORDER_LEFT;
if(loc.y == h) return t_translation::OFF_MAP_BORDER_RIGHT;
return t_translation::OFF_MAP;
}
t_translation::t_letter gamemap::get_terrain(const gamemap::location& loc) const
{
if(on_board(loc))
if(on_board(loc)) {
return tiles_[loc.x][loc.y];
}
const std::map<location, t_translation::t_letter>::const_iterator itor = borderCache_.find(loc);
if(itor != borderCache_.end()) {
return itor->second;
}
const t_translation::t_letter result = get_border_terrain(loc, x(), y());
borderCache_.insert(std::pair<location, t_translation::t_letter>(loc, result));
return result;
#if 0
// This code will be used for the editor to expand the map, thus keep it for now
const std::map<location, t_translation::t_letter>::const_iterator itor = borderCache_.find(loc);
if(itor != borderCache_.end())
return itor->second;
@ -460,6 +497,7 @@ t_translation::t_letter gamemap::get_terrain(const gamemap::location& loc) const
borderCache_.insert(std::pair<location, t_translation::t_letter>(loc,used_terrain));
return used_terrain;
#endif
}
const gamemap::location& gamemap::starting_position(int n) const