summaryrefslogtreecommitdiff
path: root/MapLoading.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-23 22:57:12 +0100
committerPetr Mrázek2012-03-23 22:57:12 +0100
commit7525c003089367823183eaf5093a90271a5eb9b4 (patch)
tree55c8ecaa6732630e3cfe0163844cafaea8425679 /MapLoading.cpp
parent719dbc048a55ba1def2ce21e9cd29e33dbe833ce (diff)
parent5322279ee165c09a6a514e865a7527079d950199 (diff)
downloadstonesense-7525c003089367823183eaf5093a90271a5eb9b4.tar.gz
stonesense-7525c003089367823183eaf5093a90271a5eb9b4.tar.bz2
stonesense-7525c003089367823183eaf5093a90271a5eb9b4.tar.xz
Merge https://github.com/JapaMala/stonesense
Conflicts: MapLoading.cpp
Diffstat (limited to 'MapLoading.cpp')
-rw-r--r--MapLoading.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/MapLoading.cpp b/MapLoading.cpp
index d37ca20..3d9cf9b 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -355,7 +355,6 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
b->tileSpecial = tileSpecial(b->tileType);
b->tileMaterial = tileMaterial(b->tileType);
-
//142,136,15
//if(b->x == 142 && b->y == 136 && b->z == 15)
// int j = 10;