Explorar o código

Merge pull request #4235 from kaja47/patch-1

reorder fields to shrink struct TerrainTile from 96 to 80 bytes
Ivan Savenko hai 1 ano
pai
achega
719f920914
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      lib/mapping/CMapDefines.h

+ 2 - 2
lib/mapping/CMapDefines.h

@@ -97,10 +97,10 @@ struct DLL_LINKAGE TerrainTile
 	bool hasFavorableWinds() const;
 
 	const TerrainType * terType;
-	ui8 terView;
 	const RiverType * riverType;
-	ui8 riverDir;
 	const RoadType * roadType;
+	ui8 terView;
+	ui8 riverDir;
 	ui8 roadDir;
 	/// first two bits - how to rotate terrain graphic (next two - river graphic, next two - road);
 	///	7th bit - whether tile is coastal (allows disembarking if land or block movement if water); 8th bit - Favorable Winds effect