src/map/IMG/rastertile.cpp

@@ -534,7 +534,7 @@ static Light::Color ordinaryLight(const QVector<Light> &lights)
 
 static quint32 pointType(quint32 type, quint32 flags)
 {
-	if (Style::hasColorset(type) || Style::isDHPoint(type))
+	if (Style::hasColorset(type))
 		return type | (flags & 0xFF000000);
 	else if (Style::isLabelPoint(type))
 		return type | (flags & 0xFFF00000);

src/map/IMG/rgnfile.cpp

@@ -605,15 +605,16 @@ bool RGNFile::readLclFields(Handle &hdl, const quint32 flags[3],
 				} else
 					size = m + 1;
 
-				quint32 off = pos(hdl);
-
-				if (i == 2 && point)
-					readLclNavaid(hdl, size, point);
-				else if (i == 3 && point)
-					readLclImg(hdl, size, point);
-
-				if (!seek(hdl, off + size))
-					return false;
+				if (i == 2 && point) {
+					if (!readLclNavaid(hdl, size, point))
+						return false;
+				} else if (i == 3 && point) {
+					if (!readLclImg(hdl, size, point))
+						return false;
+				} else {
+					if (!seek(hdl, pos(hdl) + size))
+						return false;
+				}
 			}
 			bitfield >>= 1;
 			j++;

src/map/IMG/style.cpp

@@ -869,9 +869,6 @@ void Style::defaultPointStyle(qreal ratio)
 	_points[0x10217] = Point(QImage(":/marine/pylon.png"));
 	_points[0x10218] = Point(QImage(":/marine/pylon.png"));
 
-	_points[0x10300 | 29<<24] = Point(QImage(":/marine/flagstaff.png"));
-	_points[0x10300 | 30<<24] = Point(QImage(":/marine/monument.png"));
-	_points[0x10300 | 83<<24] = Point(QImage(":/marine/crane.png"));
 	_points[0x10304] = Point(QImage(":/marine/building.png"));
 	_points[0x10305] = Point(QImage(":/marine/chimney.png"), QPoint(0, -11));
 	_points[0x10306] = Point(QImage(":/marine/church.png"));

src/map/IMG/style.h

@@ -147,7 +147,7 @@ public:
 	static bool isRaster(quint32 type)
 	  {return (type == 0x10613);}
 	static bool isDepthPoint(quint32 type)
-	  {return (type >= 0x10301 && type <= 0x10302);}
+	  {return (type == 0x10301);}
 	static bool isObstructionPoint(quint32 type)
 	  {return (type >= 0x10400 && type <= 0x10401);}
 	static bool isBuoy(quint32 type)
@@ -156,8 +156,6 @@ public:
 	  {return (type >= 0x10100 && type < 0x10200);}
 	static bool isLabelPoint(quint32 type)
 	  {return type == 0x10500;}
-	static bool isDHPoint(quint32 type)
-	  {return type == 0x10300;}
 	static bool isMarinePoint(quint32 type)
 	  {return type >= 0x10100 && type < 0x10a00;}
 	static bool isStyledLine(quint32 type)