From 85ba182fde84b95351880206d21562623365e29d Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 7 Dec 2011 18:41:38 +0000 Subject: [PATCH] (svn r23443) -Fix (r23413): Building of locks in SE failed. --- src/water_cmd.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index b7e7b3af40..5e18908a12 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -284,14 +284,16 @@ static CommandCost DoBuildLock(TileIndex tile, DiagDirection dir, DoCommandFlag if (flags & DC_EXEC) { /* Update company infrastructure counts. */ - Company *c = Company::Get(_current_company); - /* Counts for the water. */ - c->infrastructure.water++; - if (!IsWaterTile(tile - delta)) c->infrastructure.water++; - if (!IsWaterTile(tile + delta)) c->infrastructure.water++; - /* Count for the lock itself. */ - c->infrastructure.water += 3 * LOCK_DEPOT_TILE_FACTOR; // Lock is three tiles. - DirtyCompanyInfrastructureWindows(_current_company); + Company *c = Company::GetIfValid(_current_company); + if (c != NULL) { + /* Counts for the water. */ + c->infrastructure.water++; + if (!IsWaterTile(tile - delta)) c->infrastructure.water++; + if (!IsWaterTile(tile + delta)) c->infrastructure.water++; + /* Count for the lock itself. */ + c->infrastructure.water += 3 * LOCK_DEPOT_TILE_FACTOR; // Lock is three tiles. + DirtyCompanyInfrastructureWindows(_current_company); + } MakeLock(tile, _current_company, dir, wc_lower, wc_upper); MarkTileDirtyByTile(tile);