(svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs

-Fix: [993493] Buildings on water
-Feature: Water floods everything, including vehicles.
This commit is contained in:
darkvater
2004-09-03 17:57:27 +00:00
parent b5a0840621
commit 7b02cd3248
8 changed files with 75 additions and 27 deletions

View File

@@ -378,7 +378,14 @@ static int32 ClearTile_Industry(uint tile, byte flags)
{
Industry *i = DEREF_INDUSTRY(_map2[tile]);
if ((_current_player == OWNER_WATER || _game_mode != GM_EDITOR) && !_cheats.magic_bulldozer.value) {
/* * water can destroy industries
* in editor you can bulldoze industries
* with magic_bulldozer cheat you can destroy industries
* (area around OILRIG is water, so water shouldn't flood it
*/
if ((_current_player != OWNER_WATER && _game_mode != GM_EDITOR &&
!_cheats.magic_bulldozer.value) ||
(_current_player == OWNER_WATER && i->type == IT_OIL_RIG) ) {
SET_DPARAM16(0, STR_4802_COAL_MINE + i->type);
return_cmd_error(STR_4800_IN_THE_WAY);
}