Mercurial > hg > openttd

changeset 5319:2943d456d6ac draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author rubidium <rubidium@openttd.org>
date Mon, 11 Dec 2006 12:37:57 +0000
parents 7748f3702208
children 6df0d7153dd2
files industry_cmd.c town_cmd.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -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;
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -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;