Merge branch 'master' into jgrpp

# Conflicts: # src/network/network_server.h # src/pathfinder/yapf/yapf_road.cpp # src/viewport.cpp
2020-02-09 15:43:47 +00:00
parent a152e2327c e340934d04
commit babe98cdb1
43 changed files with 240 additions and 81 deletions
--- a/src/depot.cpp
+++ b/src/depot.cpp
@@ -28,6 +28,8 @@ INSTANTIATE_POOL_METHODS(Depot)
 */
 Depot::~Depot()
 {
+	free(this->name);
+
 	if (CleaningPool()) return;

 	if (!IsDepotTile(this->xy) || GetDepotIndex(this->xy) != this->index) {