| … | |
… | |
| 138 | /* extract the wall name, which is the text up to the leading _ */ |
138 | /* extract the wall name, which is the text up to the leading _ */ |
| 139 | for (l = 0; l < 64; l++) |
139 | for (l = 0; l < 64; l++) |
| 140 | { |
140 | { |
| 141 | if (wall_name[l] == '_') |
141 | if (wall_name[l] == '_') |
| 142 | { |
142 | { |
| 143 | wall_name[++l] = 0; |
143 | wall_name[l] = 0; |
| 144 | break; |
144 | break; |
| 145 | } |
145 | } |
| 146 | } |
146 | } |
| 147 | |
147 | |
|
|
148 | strcat (wall_name, "_"); |
| 148 | strcat (wall_name, wall_suffix [surround_flag2 (maze, i, j)]); |
149 | strcat (wall_name, wall_suffix [surround_flag2 (maze, i, j)]); |
| 149 | |
150 | |
| 150 | wall_arch = archetype::find (wall_name); |
151 | wall_arch = archetype::find (wall_name); |
| 151 | |
152 | |
| 152 | return wall_arch ? wall_arch->instance () : the_wall->arch->instance (); |
153 | return wall_arch ? wall_arch->instance () : the_wall->arch->instance (); |
| … | |
… | |
| 251 | /* canonicalize the wall name */ |
252 | /* canonicalize the wall name */ |
| 252 | for (l = 0; l < 64; l++) |
253 | for (l = 0; l < 64; l++) |
| 253 | { |
254 | { |
| 254 | if (RP->wall_name[l] == '_') |
255 | if (RP->wall_name[l] == '_') |
| 255 | { |
256 | { |
| 256 | RP->wall_name[++l] = 0; |
257 | RP->wall_name[l] = 0; |
| 257 | break; |
258 | break; |
| 258 | } |
259 | } |
| 259 | } |
260 | } |
| 260 | |
261 | |
|
|
262 | strcat (RP->wall_name, "_"); |
| 261 | strcat (RP->wall_name, wall_suffix [surround_flag4 (the_map, i, j)]); |
263 | strcat (RP->wall_name, wall_suffix [surround_flag4 (the_map, i, j)]); |
| 262 | |
264 | |
| 263 | wall_arch = archetype::find (RP->wall_name); |
265 | wall_arch = archetype::find (RP->wall_name); |
| 264 | |
266 | |
| 265 | if (!wall_arch) |
267 | if (!wall_arch) |
