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

toolstroke: continue refactoring for ToolEffect

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@636 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-05-16 23:44:03 +00:00
parent 5b5e278393
commit 5c85cd0a64
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -397,16 +397,20 @@ public class ToolStroke
void fixBorder(int left, int top, int right, int bottom) void fixBorder(int left, int top, int right, int bottom)
{ {
ToolEffect eff = new ToolEffect(city, left, top);
for (int x = left; x <= right; x++) for (int x = left; x <= right; x++)
{ {
fixZone(x, top); fixZone(new TranslatedToolEffect(eff, x-left, 0));
fixZone(x, bottom); fixZone(new TranslatedToolEffect(eff, x-left, bottom-top));
} }
for (int y = top + 1; y <= bottom - 1; y++) for (int y = top + 1; y <= bottom - 1; y++)
{ {
fixZone(left, y); fixZone(new TranslatedToolEffect(eff, 0, y-top));
fixZone(right, y); fixZone(new TranslatedToolEffect(eff, right-left, y-top));
} }
eff.apply();
} }
ToolResult applyParkTool(int xpos, int ypos) ToolResult applyParkTool(int xpos, int ypos)
@ -459,7 +463,12 @@ public class ToolStroke
protected void fixZone(int xpos, int ypos) protected void fixZone(int xpos, int ypos)
{ {
ToolEffect eff = new ToolEffect(city, xpos, ypos); ToolEffect eff = new ToolEffect(city, xpos, ypos);
fixZone(eff);
eff.apply();
}
protected void fixZone(ToolEffectIfc eff)
{
fixSingle(eff); fixSingle(eff);
// "fix" the cells to the north, west, east, and south // "fix" the cells to the north, west, east, and south
@ -467,8 +476,6 @@ public class ToolStroke
fixSingle(new TranslatedToolEffect(eff, -1, 0)); fixSingle(new TranslatedToolEffect(eff, -1, 0));
fixSingle(new TranslatedToolEffect(eff, 1, 0)); fixSingle(new TranslatedToolEffect(eff, 1, 0));
fixSingle(new TranslatedToolEffect(eff, 0, 1)); fixSingle(new TranslatedToolEffect(eff, 0, 1));
eff.apply();
} }
private void fixSingle(ToolEffectIfc eff) private void fixSingle(ToolEffectIfc eff)