Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20343) -Fix (r20342): don't start svn commit too early... it won't see the later changes

Browse Source
This commit is contained in:
rubidium 2010-08-03 12:47:11 +00:00
parent 725c181445
commit 0664955db7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/unmovable_cmd.cpp
View File

@ -144,7 +144,7 @@ CommandCost CmdBuildUnmovable(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
if (type >= UNMOVABLE_MAX) return CMD_ERROR; if (type >= UNMOVABLE_MAX) return CMD_ERROR;
const UnmovableSpec *spec = UnmovableSpec::Get(type); const UnmovableSpec *spec = UnmovableSpec::Get(type);
if (spec->flags & OBJECT_FLAG_ONLY_IN_SCENEDIT && _game_mode != GM_EDITOR) return CMD_ERROR; if (spec->flags & OBJECT_FLAG_ONLY_IN_SCENEDIT && (_game_mode != GM_EDITOR || _current_company != OWNER_NONE)) return CMD_ERROR;
if (spec->flags & OBJECT_FLAG_ONLY_IN_GAME && (_game_mode != GM_NORMAL || _current_company > MAX_COMPANIES)) return CMD_ERROR; if (spec->flags & OBJECT_FLAG_ONLY_IN_GAME && (_game_mode != GM_NORMAL || _current_company > MAX_COMPANIES)) return CMD_ERROR;
int size_x = GB(spec->size, 0, 4); int size_x = GB(spec->size, 0, 4);
@ -196,7 +196,7 @@ CommandCost CmdBuildUnmovable(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
BuildUnmovable(type, tile); BuildUnmovable(type, tile, _current_company);
/* Make sure the HQ starts at the right size. */ /* Make sure the HQ starts at the right size. */
if (type == UNMOVABLE_HQ) UpdateCompanyHQ(tile, hq_score); if (type == UNMOVABLE_HQ) UpdateCompanyHQ(tile, hq_score);