Merge pull request #267 from sprunk/patch-15

ashdnazg · web-flow · commit 077188c4cf6b · 2016-09-02T00:09:17.000+02:00
fix a grass-related message
diff --git a/rts/Rendering/Env/GrassDrawer.cpp b/rts/Rendering/Env/GrassDrawer.cpp
@@ -206,7 +206,7 @@ CGrassDrawer::CGrassDrawer()
 		if (grassbm.width != mapDims.mapx / grassSquareSize || grassbm.height != mapDims.mapy / grassSquareSize) {
 			char b[128];
 			SNPRINTF(b, sizeof(b), "grass-map has wrong size (%dx%d, should be %dx%d)\n",
-				grassbm.width, grassbm.height, mapDims.mapx / 4, mapDims.mapy / 4);
+				grassbm.width, grassbm.height, mapDims.mapx / grassSquareSize, mapDims.mapy / grassSquareSize);
 			throw std::runtime_error(b);
 		}
 		const int grassMapSize = mapDims.mapx * mapDims.mapy / (grassSquareSize * grassSquareSize);

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ CGrassDrawer::CGrassDrawer()`
`206`	`206`	`if (grassbm.width != mapDims.mapx / grassSquareSize \|\| grassbm.height != mapDims.mapy / grassSquareSize) {`
`207`	`207`	`char b[128];`
`208`	`208`	`SNPRINTF(b, sizeof(b), "grass-map has wrong size (%dx%d, should be %dx%d)\n",`
`209`		`- grassbm.width, grassbm.height, mapDims.mapx / 4, mapDims.mapy / 4);`
	`209`	`+ grassbm.width, grassbm.height, mapDims.mapx / grassSquareSize, mapDims.mapy / grassSquareSize);`
`210`	`210`	`throw std::runtime_error(b);`
`211`	`211`	`}`
`212`	`212`	`const int grassMapSize = mapDims.mapx * mapDims.mapy / (grassSquareSize * grassSquareSize);`