comparison arogue5/rogue.c @ 300:0250220d8cdd

Fix an assortment of compiler warnings. A few potential bugs were removed in the process. Much code cleanup remains to be done.
author John "Elwin" Edwards
date Fri, 22 Nov 2019 21:18:27 -0500
parents d3968e9cb98d
children 827441d05b3e
comparison
equal deleted inserted replaced
299:74351bf23e5e 300:0250220d8cdd
418 "Master Thief" 418 "Master Thief"
419 } 419 }
420 } ; 420 } ;
421 421
422 struct h_list helpstr[] = { 422 struct h_list helpstr[] = {
423 '?', " prints help", 423 { '?', " prints help" },
424 '/', " identify object", 424 { '/', " identify object" },
425 'h', " left", 425 { 'h', " left" },
426 'j', " down", 426 { 'j', " down" },
427 'k', " up", 427 { 'k', " up" },
428 'l', " right", 428 { 'l', " right" },
429 'y', " up & left", 429 { 'y', " up & left" },
430 'u', " up & right", 430 { 'u', " up & right" },
431 'b', " down & left", 431 { 'b', " down & left" },
432 'n', " down & right", 432 { 'n', " down & right" },
433 'H', " run left", 433 { 'H', " run left" },
434 'J', " run down", 434 { 'J', " run down" },
435 'K', " run up", 435 { 'K', " run up" },
436 'L', " run right", 436 { 'L', " run right" },
437 'Y', " run up & left", 437 { 'Y', " run up & left" },
438 'U', " run up & right", 438 { 'U', " run up & right" },
439 'B', " run down & left", 439 { 'B', " run down & left" },
440 'N', " run down & right", 440 { 'N', " run down & right" },
441 't', "<dir> throw something", 441 { 't', "<dir> throw something" },
442 'f', "<dir> forward until find something", 442 { 'f', "<dir> forward until find something" },
443 'z', "<dir> zap a wand or staff", 443 { 'z', "<dir> zap a wand or staff" },
444 '>', " go down a staircase", 444 { '>', " go down a staircase" },
445 '<', " go up a staircase", 445 { '<', " go up a staircase" },
446 's', " search for trap/secret door", 446 { 's', " search for trap/secret door" },
447 '.', " rest for a while", 447 { '.', " rest for a while" },
448 'i', " inventory", 448 { 'i', " inventory" },
449 'I', " inventory single item", 449 { 'I', " inventory single item" },
450 'q', " quaff potion", 450 { 'q', " quaff potion" },
451 'r', " read paper", 451 { 'r', " read paper" },
452 'e', " eat food", 452 { 'e', " eat food" },
453 'w', " wield a weapon", 453 { 'w', " wield a weapon" },
454 'W', " wear something", 454 { 'W', " wear something" },
455 'T', " take off something", 455 { 'T', " take off something" },
456 'd', " drop object", 456 { 'd', " drop object" },
457 'P', " pick up object(s)", 457 { 'P', " pick up object(s)" },
458 'c', " call object (generic)", 458 { 'c', " call object (generic)" },
459 'm', " mark object (specific)", 459 { 'm', " mark object (specific)" },
460 'o', " examine/set options", 460 { 'o', " examine/set options" },
461 'C', " cast a spell", 461 { 'C', " cast a spell" },
462 'p', " pray", 462 { 'p', " pray" },
463 'a', " affect the undead", 463 { 'a', " affect the undead" },
464 '^', " set a trap", 464 { '^', " set a trap" },
465 'G', " sense gold", 465 { 'G', " sense gold" },
466 'D', " dip something (into a pool)", 466 { 'D', " dip something (into a pool)" },
467 CTRL('T'), "<dir> take (steal) from (direction)", 467 { CTRL('T'), "<dir> take (steal) from (direction)" },
468 CTRL('U'), " use miscellaneous magic item", 468 { CTRL('U'), " use miscellaneous magic item" },
469 CTRL('L'), " redraw screen", 469 { CTRL('L'), " redraw screen" },
470 CTRL('R'), " repeat last message", 470 { CTRL('R'), " repeat last message" },
471 ESCAPE, " cancel command", 471 { ESCAPE, " cancel command" },
472 'v', " print program version number", 472 { 'v', " print program version number" },
473 '!', " shell escape", 473 { '!', " shell escape" },
474 'S', " save game", 474 { 'S', " save game" },
475 'Q', " quit", 475 { 'Q', " quit" },
476 0, 0 476 { 0, 0 }
477 } ; 477 } ;
478 478
479 struct h_list wiz_help[] = { 479 struct h_list wiz_help[] = {
480 CTRL('A'), " system activity", 480 { CTRL('A'), " system activity" },
481 CTRL('C'), " move to another dungeon level", 481 { CTRL('C'), " move to another dungeon level" },
482 CTRL('D'), " down 1 dungeon level", 482 { CTRL('D'), " down 1 dungeon level" },
483 CTRL('E'), " food remaining", 483 { CTRL('E'), " food remaining" },
484 CTRL('F'), " display entire level", 484 { CTRL('F'), " display entire level" },
485 CTRL('H'), " jump 9 experience levels", 485 { CTRL('H'), " jump 9 experience levels" },
486 CTRL('I'), " inventory of level", 486 { CTRL('I'), " inventory of level" },
487 CTRL('J'), " teleport", 487 { CTRL('J'), " teleport" },
488 CTRL('N'), " recharge staff", 488 { CTRL('N'), " recharge staff" },
489 CTRL('P'), " toggle wizard status", 489 { CTRL('P'), " toggle wizard status" },
490 CTRL('U'), " up 1 dungeon level", 490 { CTRL('U'), " up 1 dungeon level" },
491 CTRL('X'), " detect monsters", 491 { CTRL('X'), " detect monsters" },
492 CTRL('Z'), " identify", 492 { CTRL('Z'), " identify" },
493 'M', " make object", 493 { 'M', " make object" },
494 0, 0 494 { 0, 0 }
495 }; 495 };
496 496
497 497
498 #define HPT(x) x 498 #define HPT(x) x
499 struct monster monsters[NUMMONST+1] = { 499 struct monster monsters[NUMMONST+1] = {