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

autobulldoze: prepare for movement of auto-bulldoze code

Browse source 
When road/rail/wire tool is used, auto-bulldozing occurs before checking
the cost of the road/rail/wire being placed. This means when the user
is low on funds, the wire tool may end up bulldozing only, even though
there is not enough money for building what they want.

This patch prepares the way for moving where the auto-bulldoze check
is done in the case of the road/rail/wire tool.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@588 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-02-27 01:30:10 +00:00
parent 32d5a8db7c
commit 8b428bfc29
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -575,10 +575,6 @@ public enum MicropolisTool
char tile = (char) (engine.getTile(xpos, ypos) & LOMASK);
switch (tile)
{
case DIRT: //rail on dirt
engine.setTile(xpos, ypos, (char) (LHRAIL | BULLBIT | BURNBIT));
break;
case RIVER: // rail on water
case REDGE:
case CHANNEL:
@ -655,7 +651,14 @@ public enum MicropolisTool
break;
default:
return ToolResult.NONE;
//TODO- check if auto-bulldoze is enabled
if (tile != DIRT) {
return ToolResult.NONE;
}
//rail on dirt
engine.setTile(xpos, ypos, (char) (LHRAIL | BULLBIT | BURNBIT));
break;
}
engine.spend(cost);
@ -674,10 +677,6 @@ public enum MicropolisTool
char tile = (char) (engine.getTile(xpos, ypos) & LOMASK);
switch (tile)
{
case DIRT:
engine.setTile(xpos, ypos, (char) (TileConstants.ROADS | BULLBIT | BURNBIT));
break;
case RIVER: // road on water
case REDGE:
case CHANNEL: // check how to build bridges, if possible.
@ -754,7 +753,13 @@ public enum MicropolisTool
break;
default:
return ToolResult.NONE;
// TODO- auto-bulldoze here
if (tile != DIRT)
return ToolResult.NONE;
// road on dirt
engine.setTile(xpos, ypos, (char) (TileConstants.ROADS | BULLBIT | BURNBIT));
break;
}
engine.spend(cost);
@ -775,10 +780,6 @@ public enum MicropolisTool
switch (tile)
{
case DIRT: //wire on dirt
engine.setTile(xpos, ypos, (char) (LHPOWER | CONDBIT | BULLBIT | BURNBIT));
break;
case RIVER: // wire on water
case REDGE:
case CHANNEL:
@ -866,8 +867,15 @@ public enum MicropolisTool
engine.setTile(xpos, ypos, (char) (RAILVPOWERH | CONDBIT | BURNBIT | BULLBIT));
break;
default: //cannot do wire here
return ToolResult.NONE;
default:
if (tile != DIRT) {
//cannot do wire here
return ToolResult.NONE;
}
//wire on dirt
engine.setTile(xpos, ypos, (char) (LHPOWER | CONDBIT | BULLBIT | BURNBIT));
break;
}
engine.spend(cost);