diff srogue/global.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
line wrap: on
line diff
--- a/srogue/global.c	Sun Feb 11 15:37:33 2018 -0500
+++ b/srogue/global.c	Fri Nov 22 21:18:27 2019 -0500
@@ -179,52 +179,52 @@
 #undef _r
 
 struct h_list helpstr[] = {
-	'?',	"	prints help",
-	'/',	"	identify object",
-	'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",
-	'p',	"<dir>	zap a wand in a direction",
-	'z',	"	zap a wand or staff",
-	'>',	"	go down a staircase",
-	's',	"	search for trap/secret door",
-	'.',	"	(dot) rest for a while",
-	'i',	"	inventory pack",
-	'I',	"	inventory single item",
-	'q',	"	quaff potion",
-	'r',	"	read a scroll",
-	'e',	"	eat food",
-	'w',	"	wield a weapon",
-	'W',	"	wear armor",
-	'T',	"	take armor off",
-	'P',	"	put on ring",
-	'R',	"	remove ring",
-	'd',	"	drop object",
-	'c',	"	call object",
-	'O',	"	examine/set options",
-	'a',	"	display maximum stats",
-	'D',	"	dip object in pool",
-	CTRL('L'),"	redraw screen",
-	ESCAPE,	"	cancel command",
-	'!',	"	shell escape",
-	'S',	"	save game",
-	'Q',	"	quit",
-	0, 0
+	{ '?',	"	prints help" },
+	{ '/',	"	identify object" },
+	{ '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" },
+	{ 'p',	"<dir>	zap a wand in a direction" },
+	{ 'z',	"	zap a wand or staff" },
+	{ '>',	"	go down a staircase" },
+	{ 's',	"	search for trap/secret door" },
+	{ '.',	"	(dot) rest for a while" },
+	{ 'i',	"	inventory pack" },
+	{ 'I',	"	inventory single item" },
+	{ 'q',	"	quaff potion" },
+	{ 'r',	"	read a scroll" },
+	{ 'e',	"	eat food" },
+	{ 'w',	"	wield a weapon" },
+	{ 'W',	"	wear armor" },
+	{ 'T',	"	take armor off" },
+	{ 'P',	"	put on ring" },
+	{ 'R',	"	remove ring" },
+	{ 'd',	"	drop object" },
+	{ 'c',	"	call object" },
+	{ 'O',	"	examine/set options" },
+	{ 'a',	"	display maximum stats" },
+	{ 'D',	"	dip object in pool" },
+	{ CTRL('L'),"	redraw screen" },
+	{ ESCAPE,	"	cancel command" },
+	{ '!',	"	shell escape" },
+	{ 'S',	"	save game" },
+	{ 'Q',	"	quit" },
+	{ 0, 0 }
 };
 
 char *s_names[MAXSCROLLS];		/* Names of the scrolls */