File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ namespace OpenXcom
2222{
2323
2424/* *
25- *
25+ * TODO: Daiky to organise and document the functions here
2626*/
2727MapData::MapData (MapDataSet *dataset) : _dataset(dataset)
2828{
Original file line number Diff line number Diff line change 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
2626namespace 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" ;
Original file line number Diff line number Diff 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 */
6767void 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)
You can’t perform that action at this time.
0 commit comments