src/map/IMG/jls.h

@@ -60,14 +60,18 @@ private:
 	struct Context
 	{
 		Context(quint16 width, quint16 range)
-		  : data(QVector<quint16>((width + 3) * 2)), w(width), rg(1),
-		  runIndex(0), rk(0), lrk(0)
 		{
-			quint16 A = qMax(2, (range + 32) / 64);
+			w = width;
-
+			data = QVector<quint16>((w + 3) * 2);
 			last = data.data();
 			current = data.data() + (w + 3);
 
+			runIndex = 0;
+			rk = 0;
+			rg = 1;
+			lrk = 0;
+
+			quint16 A = qMax(2, (range + 32) / 64);
 			for (int i = 0; i < 4; i++) {
 				a[i] = A;
 				b[i] = 0;
@@ -75,17 +79,18 @@ private:
 			}
 		}
 
-		QVector<quint16> data;
+		quint8 runIndex;
-		quint16 *current;
+		quint8 rk;
-		quint16 *last;
-		quint16 w;
 		quint16 rg;
 		quint16 n[4];
 		quint16 a[4];
 		qint16 b[4];
-		quint8 runIndex;
-		quint8 rk;
 		quint8 lrk;
+
+		quint16 w;
+		QVector<quint16> data;
+		quint16 *current;
+		quint16 *last;
 	};
 
 	bool readLine(BitStream &bs, Context &ctx) const;