Mercurial > hg > early-roguelike

diff arogue7/rogue.c @ 300:0250220d8cdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/arogue7/rogue.c	Sun Feb 11 15:37:33 2018 -0500
+++ b/arogue7/rogue.c	Fri Nov 22 21:18:27 2019 -0500
@@ -625,81 +625,81 @@
 } ;
 
 struct h_list helpstr[] = {
-    '?',	"	prints help",
-    '/',	"	identify object",
-    '=',	"	identify screen character",
-    'h',	"	left",
-    'j',	"	down",
-    'k',	"	up",
-    'l',	"	right",
-    'y',	"	up & left",
-    'u',	"	up & right",
-    'b',	"	down & left",
-    'n',	"	down & right",
-    'H',	"	run left",
-    'J',	"	run down",
-    'K',	"	run up",
-    'L',	"	run right",
-    'Y',	"	run up & left",
-    'U',	"	run up & right",
-    'B',	"	run down & left",
-    'N',	"	run down & right",
-    't',	"<dir>	throw something",
-    'f',	"<dir>	forward until find something",
-    'z',	"<dir>	zap a wand or staff",
-    '>',	"	go down a staircase",
-    '<',	"	go up a staircase",
-    's',	"	search for trap/secret door",
-    '.',	"	rest for a while",
-    'i',	"	inventory",
-    'I',	"	inventory single item",
-    'q',	"	quaff potion",
-    'r',	"	read paper",
-    'e',	"	eat food",
-    'w',	"	wield a weapon",
-    'W',	"	wear something",
-    'T',	"	take off something",
-    'd',	"	drop object",
-    'P',	"	pick up object(s)",
-    CTRL('N'),	"	name object or monster",
-    'm',	"	mark object (specific)",
-    'o',	"	examine/set options",
-    'c',	"	chant",
-    'C',	"	cast a spell",
-    'p',	"	pray",
-    'a',	"	affect the undead",
-    '^',	"	set a trap",
-    'G',	"	sense gold",
-    'D',	"	dip something (into a pool)",
-    '*',	"	count up gold pieces",
-    CTRL('T'),	"<dir>	take (steal) from (direction)",
-    CTRL('U'),	"	use miscellaneous magic item",
-    CTRL('L'),	"	redraw screen",
-    CTRL('R'),	"	repeat last message",
-    ESCAPE,	"	cancel command",
-    'v',	"	print program version number",
-    '!',	"	shell escape",
-    'S',	"	save game",
-    'Q',	"	quit",
-    0, 0
+    { '?',	"	prints help" },
+    { '/',	"	identify object" },
+    { '=',	"	identify screen character" },
+    { 'h',	"	left" },
+    { 'j',	"	down" },
+    { 'k',	"	up" },
+    { 'l',	"	right" },
+    { 'y',	"	up & left" },
+    { 'u',	"	up & right" },
+    { 'b',	"	down & left" },
+    { 'n',	"	down & right" },
+    { 'H',	"	run left" },
+    { 'J',	"	run down" },
+    { 'K',	"	run up" },
+    { 'L',	"	run right" },
+    { 'Y',	"	run up & left" },
+    { 'U',	"	run up & right" },
+    { 'B',	"	run down & left" },
+    { 'N',	"	run down & right" },
+    { 't',	"<dir>	throw something" },
+    { 'f',	"<dir>	forward until find something" },
+    { 'z',	"<dir>	zap a wand or staff" },
+    { '>',	"	go down a staircase" },
+    { '<',	"	go up a staircase" },
+    { 's',	"	search for trap/secret door" },
+    { '.',	"	rest for a while" },
+    { 'i',	"	inventory" },
+    { 'I',	"	inventory single item" },
+    { 'q',	"	quaff potion" },
+    { 'r',	"	read paper" },
+    { 'e',	"	eat food" },
+    { 'w',	"	wield a weapon" },
+    { 'W',	"	wear something" },
+    { 'T',	"	take off something" },
+    { 'd',	"	drop object" },
+    { 'P',	"	pick up object(s)" },
+    { CTRL('N'),	"	name object or monster" },
+    { 'm',	"	mark object (specific)" },
+    { 'o',	"	examine/set options" },
+    { 'c',	"	chant" },
+    { 'C',	"	cast a spell" },
+    { 'p',	"	pray" },
+    { 'a',	"	affect the undead" },
+    { '^',	"	set a trap" },
+    { 'G',	"	sense gold" },
+    { 'D',	"	dip something (into a pool)" },
+    { '*',	"	count up gold pieces" },
+    { CTRL('T'),	"<dir>	take (steal) from (direction)" },
+    { CTRL('U'),	"	use miscellaneous magic item" },
+    { CTRL('L'),	"	redraw screen" },
+    { CTRL('R'),	"	repeat last message" },
+    { ESCAPE,	"	cancel command" },
+    { 'v',	"	print program version number" },
+    { '!',	"	shell escape" },
+    { 'S',	"	save game" },
+    { 'Q',	"	quit" },
+    { 0, 0 }
 } ;
 
 struct h_list wiz_help[] = {
-    CTRL('A'),	"	system activity",
-    CTRL('C'),	"	move to	another	dungeon	level",
-    CTRL('D'),	"	down 1 dungeon level",
-    CTRL('E'),	"	food remaining",
-    CTRL('F'),	"	display entire level",
-    CTRL('H'),	"	jump 9 experience levels",
-    CTRL('I'),	"	inventory of level",
-    CTRL('J'),	"	teleport",
-    CTRL('M'),	"	recharge staff",
-    CTRL('P'),	"	toggle wizard status",
-    CTRL('U'),	"	up 1 dungeon level",
-    CTRL('X'),	"	detect monsters",
-    CTRL('Z'),	"	identify",
-    'M',	"	make object",
-    0, 0
+    { CTRL('A'),	"	system activity" },
+    { CTRL('C'),	"	move to	another	dungeon	level" },
+    { CTRL('D'),	"	down 1 dungeon level" },
+    { CTRL('E'),	"	food remaining" },
+    { CTRL('F'),	"	display entire level" },
+    { CTRL('H'),	"	jump 9 experience levels" },
+    { CTRL('I'),	"	inventory of level" },
+    { CTRL('J'),	"	teleport" },
+    { CTRL('M'),	"	recharge staff" },
+    { CTRL('P'),	"	toggle wizard status" },
+    { CTRL('U'),	"	up 1 dungeon level" },
+    { CTRL('X'),	"	detect monsters" },
+    { CTRL('Z'),	"	identify" },
+    { 'M',	"	make object" },
+    { 0, 0 }
 };