Mercurial > hg > openttd
changeset 15678:fc72f8feb746 draft
(svn r20343) -Fix (r20342): don't start svn commit too early... it won't see the later changes
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Tue, 03 Aug 2010 12:47:11 +0000 |
| parents | c9721ab3d965 |
| children | 7d5a8cb093f1 |
| files | src/unmovable_cmd.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -144,7 +144,7 @@ if (type >= UNMOVABLE_MAX) return CMD_ERROR; 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; int size_x = GB(spec->size, 0, 4); @@ -196,7 +196,7 @@ } if (flags & DC_EXEC) { - BuildUnmovable(type, tile); + BuildUnmovable(type, tile, _current_company); /* Make sure the HQ starts at the right size. */ if (type == UNMOVABLE_HQ) UpdateCompanyHQ(tile, hq_score);