# HG changeset patch # User rubidium # Date 1165840677 0 # Node ID 37f1411c79e7000c3bff7d7e5d6df7a58fc16d77 # Parent e02e5b76b355ae62f2150aafab8899cba653e977 (svn r7477) -Fix (7451): Allocate(Industry|Town) get called twice when trying to build an industry/town via a command, thus incrementing the number of towns/industries twice when created via a command. diff -r e02e5b76b355 -r 37f1411c79e7 industry_cmd.c --- a/industry_cmd.c Mon Dec 11 12:32:23 2006 +0000 +++ b/industry_cmd.c Mon Dec 11 12:37:57 2006 +0000 @@ -1362,8 +1362,6 @@ if (IsValidIndustry(i)) continue; - _total_industries++; - memset(i, 0, sizeof(*i)); i->index = index; @@ -1380,6 +1378,7 @@ uint32 r; int j; + _total_industries++; i->xy = tile; i->width = i->height = 0; i->type = type; diff -r e02e5b76b355 -r 37f1411c79e7 town_cmd.c --- a/town_cmd.c Mon Dec 11 12:32:23 2006 +0000 +++ b/town_cmd.c Mon Dec 11 12:37:57 2006 +0000 @@ -915,6 +915,7 @@ i = t->index; memset(t, 0, sizeof(Town)); t->index = i; + _total_towns++; t->xy = tile; t->num_houses = 0; @@ -984,8 +985,6 @@ if (!IsValidTown(t)) { TownID index = t->index; - _total_towns++; - memset(t, 0, sizeof(Town)); t->index = index;