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

toolstroke: do not pick random numbers when generating a tool preview

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@647 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-05-16 23:46:09 +00:00
parent 59c5547e87
commit 47fdf7c3c2
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/micropolisj/engine/Bulldozer.java
View file

@ -100,8 +100,8 @@ class Bulldozer extends ToolStroke
continue; continue;
tile = tile & LOMASK; tile = tile & LOMASK;
if (tile != RADTILE && tile != DIRT) { if (tile != RADTILE && tile != DIRT) {
int nTile = (TINYEXP + city.PRNG.nextInt(3)) int z = inPreview ? 0 : city.PRNG.nextInt(3);
| ANIMBIT | BULLBIT; int nTile = (TINYEXP + z) | ANIMBIT | BULLBIT;
eff.setTile(xx, yy, nTile); eff.setTile(xx, yy, nTile);
} }
} }

11
src/micropolisj/engine/ToolStroke.java
View file

@ -19,6 +19,7 @@ public class ToolStroke
int ypos; int ypos;
int xdest; int xdest;
int ydest; int ydest;
boolean inPreview;
ToolStroke(Micropolis city, MicropolisTool tool, int xpos, int ypos) ToolStroke(Micropolis city, MicropolisTool tool, int xpos, int ypos)
{ {
@ -33,7 +34,13 @@ public class ToolStroke
public final ToolPreview getPreview() public final ToolPreview getPreview()
{ {
ToolEffect eff = new ToolEffect(city); ToolEffect eff = new ToolEffect(city);
applyArea(eff); inPreview = true;
try {
applyArea(eff);
}
finally {
inPreview = false;
}
return eff.preview; return eff.preview;
} }
@ -232,7 +239,7 @@ public class ToolStroke
} }
} }
int z = city.PRNG.nextInt(5); int z = inPreview ? 0 : city.PRNG.nextInt(5);
int tile; int tile;
if (z < 4) { if (z < 4) {
tile = (WOODS2 + z) | BURNBIT | BULLBIT; tile = (WOODS2 + z) | BURNBIT | BULLBIT;