graphics: tiles.dat: allow spaces before pipes
this allows layer names to be more nicely lined up git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@708 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
parent
d8444ff2e4
commit
cae33311b3
2 changed files with 10 additions and 10 deletions
|
@ -27,7 +27,7 @@ public class MakeTiles
|
|||
if (l.startsWith("#")) {
|
||||
continue;
|
||||
}
|
||||
String[] parts = l.split("\\s+");
|
||||
String[] parts = l.split("\\s+", 2);
|
||||
String tileName = parts[0];
|
||||
String tileImage = parts[1];
|
||||
tileData.put(tileName, tileImage);
|
||||
|
@ -89,7 +89,7 @@ public class MakeTiles
|
|||
{
|
||||
ImageSpec result = null;
|
||||
|
||||
for (String layerStr : chain.split("\\|")) {
|
||||
for (String layerStr : chain.split("\\s*\\|")) {
|
||||
|
||||
ImageSpec rv = new ImageSpec();
|
||||
rv.background = result;
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
77 roads@0,208,16,16
|
||||
78 roads@0,224,16,16
|
||||
79 roads@0,240,16,16
|
||||
80 roads@0,0,16,16|traffic@16,0,16,16
|
||||
80 roads@0,0,16,16 |traffic@16,0,16,16
|
||||
81 roads@0,16,16,16|traffic@16,16,16,16
|
||||
82 roads@0,32,16,16|traffic@16,0,16,16
|
||||
83 roads@0,48,16,16|traffic@16,16,16,16
|
||||
|
@ -94,7 +94,7 @@
|
|||
93 roads@16,208,16,16
|
||||
94 roads@16,224,16,16
|
||||
95 roads@16,240,16,16
|
||||
96 roads@0,0,16,16|traffic@32,0,16,16
|
||||
96 roads@0,0,16,16 |traffic@32,0,16,16
|
||||
97 roads@0,16,16,16|traffic@32,16,16,16
|
||||
98 roads@0,32,16,16|traffic@32,0,16,16
|
||||
99 roads@0,48,16,16|traffic@32,16,16,16
|
||||
|
@ -110,7 +110,7 @@
|
|||
109 roads@32,208,16,16
|
||||
110 roads@32,224,16,16
|
||||
111 roads@32,240,16,16
|
||||
112 roads@0,0,16,16|traffic@48,0,16,16
|
||||
112 roads@0,0,16,16 |traffic@48,0,16,16
|
||||
113 roads@0,16,16,16|traffic@48,16,16,16
|
||||
114 roads@0,32,16,16|traffic@48,0,16,16
|
||||
115 roads@0,48,16,16|traffic@48,16,16,16
|
||||
|
@ -126,7 +126,7 @@
|
|||
125 roads@48,208,16,16
|
||||
126 roads@48,224,16,16
|
||||
127 roads@48,240,16,16
|
||||
128 roads@0,0,16,16|traffic@64,0,16,16
|
||||
128 roads@0,0,16,16 |traffic@64,0,16,16
|
||||
129 roads@0,16,16,16|traffic@64,16,16,16
|
||||
130 roads@0,32,16,16|traffic@64,0,16,16
|
||||
131 roads@0,48,16,16|traffic@64,16,16,16
|
||||
|
@ -142,7 +142,7 @@
|
|||
141 roads@64,208,16,16
|
||||
142 roads@64,224,16,16
|
||||
143 roads@64,240,16,16
|
||||
144 roads@0,0,16,16|traffic@80,0,16,16
|
||||
144 roads@0,0,16,16 |traffic@80,0,16,16
|
||||
145 roads@0,16,16,16|traffic@80,16,16,16
|
||||
146 roads@0,32,16,16|traffic@80,0,16,16
|
||||
147 roads@0,48,16,16|traffic@80,16,16,16
|
||||
|
@ -158,7 +158,7 @@
|
|||
157 roads@80,208,16,16
|
||||
158 roads@80,224,16,16
|
||||
159 roads@80,240,16,16
|
||||
160 roads@0,0,16,16|traffic@96,0,16,16
|
||||
160 roads@0,0,16,16 |traffic@96,0,16,16
|
||||
161 roads@0,16,16,16|traffic@96,16,16,16
|
||||
162 roads@0,32,16,16|traffic@96,0,16,16
|
||||
163 roads@0,48,16,16|traffic@96,16,16,16
|
||||
|
@ -174,7 +174,7 @@
|
|||
173 roads@96,208,16,16
|
||||
174 roads@96,224,16,16
|
||||
175 roads@96,240,16,16
|
||||
176 roads@0,0,16,16|traffic@112,0,16,16
|
||||
176 roads@0,0,16,16 |traffic@112,0,16,16
|
||||
177 roads@0,16,16,16|traffic@112,16,16,16
|
||||
178 roads@0,32,16,16|traffic@112,0,16,16
|
||||
179 roads@0,48,16,16|traffic@112,16,16,16
|
||||
|
@ -190,7 +190,7 @@
|
|||
189 roads@112,208,16,16
|
||||
190 roads@112,224,16,16
|
||||
191 roads@112,240,16,16
|
||||
192 roads@0,0,16,16|traffic@128,0,16,16
|
||||
192 roads@0,0,16,16 |traffic@128,0,16,16
|
||||
193 roads@0,16,16,16|traffic@128,16,16,16
|
||||
194 roads@0,32,16,16|traffic@128,0,16,16
|
||||
195 roads@0,48,16,16|traffic@128,16,16,16
|
||||
|
|
Reference in a new issue