Corrects compiler errors for MS C++.
Mordante, please have a look at this, especially the insertion of an additional parameter to the string constructor.
This commit is contained in:
parent
1c2b169e6e
commit
d84a013cce
2 changed files with 3 additions and 2 deletions
|
@ -43,6 +43,7 @@ std::ostream &operator<<(std::ostream &s, gamemap::location const &l) {
|
|||
gamemap::location gamemap::location::null_location;
|
||||
|
||||
const std::string gamemap::default_map_header = "usage=map\nborder_size=1\n\n";
|
||||
const gamemap::tborder gamemap::default_border = gamemap::SINGLE_TILE_BORDER;
|
||||
|
||||
const t_translation::t_list& gamemap::underlying_mvt_terrain(t_translation::t_letter terrain) const
|
||||
{
|
||||
|
@ -364,7 +365,7 @@ void gamemap::read(const std::string& data, const tborder border_tiles, const tu
|
|||
throw incorrect_format_exception(msg.c_str());
|
||||
}
|
||||
|
||||
map = std::string(data, header_offset + 2);
|
||||
map = std::string(data, 0, header_offset + 2);
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
@ -224,7 +224,7 @@ public:
|
|||
//! terrain_translation::write_game_map().
|
||||
static const std::string default_map_header;
|
||||
//! The default border style for a map
|
||||
static const tborder default_border = SINGLE_TILE_BORDER;
|
||||
static const tborder default_border;
|
||||
|
||||
protected:
|
||||
t_translation::t_map tiles_;
|
||||
|
|
Loading…
Add table
Reference in a new issue