comparison arogue5/options.c @ 266:08489644940b

Merge the UltraRogue branch.
author John "Elwin" Edwards
date Sun, 19 Feb 2017 19:56:43 -0500
parents e940e6c00751
children d3968e9cb98d
comparison
equal deleted inserted replaced
265:7fcb2f9f57e6 266:08489644940b
375 len = (int)(sp - str); 375 len = (int)(sp - str);
376 /* 376 /*
377 * Look it up and deal with it 377 * Look it up and deal with it
378 */ 378 */
379 for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) 379 for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++)
380 {
380 /* None of these can be changed if using system savefiles. */ 381 /* None of these can be changed if using system savefiles. */
381 if (use_savedir && (!strcmp(op->o_name, "name") || 382 if (use_savedir && (!strcmp(op->o_name, "name") ||
382 !strcmp(op->o_name, "file") || 383 !strcmp(op->o_name, "file") ||
383 !strcmp(op->o_name, "score") )) 384 !strcmp(op->o_name, "score") ))
384 continue; 385 continue;
440 && EQSTR(str, "no", 2) && EQSTR(str + 2, op->o_name, len - 2)) 441 && EQSTR(str, "no", 2) && EQSTR(str + 2, op->o_name, len - 2))
441 { 442 {
442 *(bool *)op->o_opt = FALSE; 443 *(bool *)op->o_opt = FALSE;
443 break; 444 break;
444 } 445 }
446 }
445 447
446 /* 448 /*
447 * skip to start of next option name 449 * skip to start of next option name
448 */ 450 */
449 while (*sp && !isalpha(*sp)) 451 while (*sp && !isalpha(*sp))