archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autobulldoze- fix behavior of wire tool

Browse source 
now when there's not enough money to build wire, the auto-bulldoze
will not have any effect

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@590 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-02-27 01:30:23 +00:00
parent d10ec8e5b1
commit 408d3d44bf
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/micropolisj/engine/MicropolisTool.java
View file

@ -331,6 +331,22 @@ public enum MicropolisTool
} }
} }
/**
* Checks whether the tile can be auto-bulldozed for
* placement of road, rail, or wire.
*/
static boolean canAutoBulldozeRRW(int tileValue)
{
//FIXME- explain why LASTTINYEXP is the upper bound here,
// when the Z-version of this function uses LASTTINYEXP+2
// can we autobulldoze this tile?
return (
(tileValue >= FIRSTRIVEDGE && tileValue <= LASTRUBBLE) ||
(tileValue >= TINYEXP && tileValue <= LASTTINYEXP)
);
}
/** /**
* Checks whether the tile can be auto-bulldozed for * Checks whether the tile can be auto-bulldozed for
* placement of a zone. * placement of a zone.
@ -529,7 +545,6 @@ public enum MicropolisTool
if (!engine.testBounds(xpos, ypos)) if (!engine.testBounds(xpos, ypos))
return ToolResult.UH_OH; return ToolResult.UH_OH;
autoDoze(engine, xpos, ypos);
ToolResult result = layWire(engine, xpos, ypos); ToolResult result = layWire(engine, xpos, ypos);
fixZone(engine, xpos, ypos); fixZone(engine, xpos, ypos);
return result; return result;
@ -876,8 +891,13 @@ public enum MicropolisTool
default: default:
if (tile != DIRT) { if (tile != DIRT) {
//cannot do wire here if (engine.autoBulldoze && canAutoBulldozeRRW(tile)) {
return ToolResult.NONE; cost += 1; //autodoze cost
}
else {
//cannot do wire here
return ToolResult.NONE;
}
} }
//wire on dirt //wire on dirt