Skip to content

Commit eb56fbd

Browse files
committed
- Fix Linux build issue.
git-svn-id: https://openxcom.svn.sourceforge.net/svnroot/openxcom/trunk@243 11c4a5ed-7179-4546-81a6-367b3be9d812
1 parent f30fe5f commit eb56fbd

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/Ruleset/MapData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace OpenXcom
2222
{
2323

2424
/**
25-
*
25+
* TODO: Daiky to organise and document the functions here
2626
*/
2727
MapData::MapData(MapDataSet *dataset) : _dataset(dataset)
2828
{

src/Ruleset/MapDataSet.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "MapData.h"
2121
#include <fstream>
2222
#include <sstream>
23-
#include "..\Engine\SurfaceSet.h"
24-
#include "..\Resource\ResourcePack.h"
23+
#include "../Engine/SurfaceSet.h"
24+
#include "../Resource/ResourcePack.h"
2525

2626
namespace OpenXcom
2727
{
@@ -144,7 +144,7 @@ void MapDataSet::load(ResourcePack *res)
144144
s << res->getFolder() << "TERRAIN/" << _name << ".MCD";
145145

146146
// Load file
147-
std::ifstream mapFile (res->insensitive(s.str()), std::ios::in | std::ios::binary);
147+
std::ifstream mapFile (res->insensitive(s.str()).c_str(), std::ios::in | std::ios::binary);
148148
if (!mapFile)
149149
{
150150
throw "Failed to load MCD";

src/Savegame/Tile.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ MapData *Tile::getMapData(int part)
6161

6262
/**
6363
* Set the MapData references of part 0 to 3.
64-
* @param tob pointer to the terrain object
64+
* @param dat pointer to the data object
6565
* @param part the part number
6666
*/
6767
void Tile::setMapData(MapData *dat, int part)
@@ -319,7 +319,6 @@ void Tile::destroy(int part)
319319
{
320320
if (_objects[part])
321321
{
322-
MapData *current = _objects[part];
323322
setMapData(0, part);
324323
MapData *dead = _objects[part]->getDataset()->getObjects()->at(_objects[part]->getDieMCD());
325324
if (dead)

0 commit comments

Comments
 (0)