Mercurial > hg > forks > yadex

comparison src/l_align.cc @ 70:dd9e9b980eb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove code from AlignTexturesX() that does nothing now, as the logic has been changed and cleaned up.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 26 Sep 2011 11:23:55 +0300
parents 12b6553c057e
children 2f1ecc1c5f72
comparison
equal deleted inserted replaced
69:12b6553c057e 70:dd9e9b980eb9
242 if (key == YK_ESC) 242 if (key == YK_ESC)
243 return; 243 return;
244 } 244 }
245 245
246 /* Main processing loop */ 246 /* Main processing loop */
247 while (*sdlist)
248 xoffset = opt_offset ? useroffset : 0; 247 xoffset = opt_offset ? useroffset : 0;
249 while (*sdlist != NULL) 248 while (*sdlist != NULL)
250 { 249 {
251 ldef = 0;
252 sdef = (*sdlist)->objnum; 250 sdef = (*sdlist)->objnum;
253 251
254 if (opt_sdef == 1) /* throw out all 2nd SideDefs untill a 1st is found */
255 {
256 while (LineDefs[ldef].sidedef1 != sdef && ldef <= NumLineDefs)
257 {
258 ldef++;
259 if (LineDefs[ldef].sidedef2 == sdef)
260 {
261 UnSelectObject(sdlist, (*sdlist)->objnum);
262 if (*sdlist == NULL)
263 {
264 sprintf(errormessage, "Error in opt_sdef==1, *sdlist == NULL");
265 Notify(-1, -1, errormessage, 0);
266 return;
267 }
268 sdef = (*sdlist)->objnum;
269 ldef = 0;
270 }
271 }
272 }
273 else
274 if (opt_sdef == 2) /* throw out all 1st SideDefs untill a 2nd is found */
275 {
276 while (LineDefs[ldef].sidedef2 != sdef && ldef <= NumLineDefs)
277 {
278 ldef++;
279 if (LineDefs[ldef].sidedef1 == sdef)
280 {
281 UnSelectObject(sdlist, (*sdlist)->objnum);
282 if (*sdlist == NULL)
283 {
284 sprintf(errormessage, "Error in opt_sdef==2, *sdlist == NULL");
285 Notify(-1, -1, errormessage, 0);
286 return;
287 }
288 sdef = (*sdlist)->objnum;
289 ldef = 0;
290 }
291 }
292 }
293
294 /* do we test for same textures for the sidedef in question?? */
295 sdef = (*sdlist)->objnum;
296 /* Check for contiguous textures, if required */ 252 /* Check for contiguous textures, if required */
297 if (opt_check) 253 if (opt_check)
298 { 254 {
299 SDPtr pdef = &SideDefs[sdef]; 255 SDPtr pdef = &SideDefs[sdef];
300 if ((opt_mode == 3 && strncmp(pdef->tex3, texname, WAD_TEX_NAME)) || 256 if ((opt_mode == 3 && strncmp(pdef->tex3, texname, WAD_TEX_NAME)) ||