Merge remote-tracking branch 'upstream/master'

2021-08-16 01:58:47 +03:00
parent c4d5a71da1 97a23be348
commit a38dc30bf6
699 changed files with 41187 additions and 22617 deletions
@@ -48,7 +48,7 @@ void AllocateMap(uint size_x, uint size_y)
 		error("Invalid map size");
 	}

-	DEBUG(map, 1, "Allocating map of size %dx%d", size_x, size_y);
+	Debug(map, 1, "Allocating map of size {}x{}", size_x, size_y);

 	_map_log_x = FindFirstBit(size_x);
 	_map_log_y = FindFirstBit(size_y);