comparison 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
comparison
equal deleted inserted replaced
299:74351bf23e5e 300:0250220d8cdd
177 #undef _p /* erase these definitions */ 177 #undef _p /* erase these definitions */
178 #undef _c 178 #undef _c
179 #undef _r 179 #undef _r
180 180
181 struct h_list helpstr[] = { 181 struct h_list helpstr[] = {
182 '?', " prints help", 182 { '?', " prints help" },
183 '/', " identify object", 183 { '/', " identify object" },
184 'h', " left", 184 { 'h', " left" },
185 'j', " down", 185 { 'j', " down" },
186 'k', " up", 186 { 'k', " up" },
187 'l', " right", 187 { 'l', " right" },
188 'y', " up & left", 188 { 'y', " up & left" },
189 'u', " up & right", 189 { 'u', " up & right" },
190 'b', " down & left", 190 { 'b', " down & left" },
191 'n', " down & right", 191 { 'n', " down & right" },
192 'H', " run left", 192 { 'H', " run left" },
193 'J', " run down", 193 { 'J', " run down" },
194 'K', " run up", 194 { 'K', " run up" },
195 'L', " run right", 195 { 'L', " run right" },
196 'Y', " run up & left", 196 { 'Y', " run up & left" },
197 'U', " run up & right", 197 { 'U', " run up & right" },
198 'B', " run down & left", 198 { 'B', " run down & left" },
199 'N', " run down & right", 199 { 'N', " run down & right" },
200 't', "<dir> throw something", 200 { 't', "<dir> throw something" },
201 'f', "<dir> forward until find something", 201 { 'f', "<dir> forward until find something" },
202 'p', "<dir> zap a wand in a direction", 202 { 'p', "<dir> zap a wand in a direction" },
203 'z', " zap a wand or staff", 203 { 'z', " zap a wand or staff" },
204 '>', " go down a staircase", 204 { '>', " go down a staircase" },
205 's', " search for trap/secret door", 205 { 's', " search for trap/secret door" },
206 '.', " (dot) rest for a while", 206 { '.', " (dot) rest for a while" },
207 'i', " inventory pack", 207 { 'i', " inventory pack" },
208 'I', " inventory single item", 208 { 'I', " inventory single item" },
209 'q', " quaff potion", 209 { 'q', " quaff potion" },
210 'r', " read a scroll", 210 { 'r', " read a scroll" },
211 'e', " eat food", 211 { 'e', " eat food" },
212 'w', " wield a weapon", 212 { 'w', " wield a weapon" },
213 'W', " wear armor", 213 { 'W', " wear armor" },
214 'T', " take armor off", 214 { 'T', " take armor off" },
215 'P', " put on ring", 215 { 'P', " put on ring" },
216 'R', " remove ring", 216 { 'R', " remove ring" },
217 'd', " drop object", 217 { 'd', " drop object" },
218 'c', " call object", 218 { 'c', " call object" },
219 'O', " examine/set options", 219 { 'O', " examine/set options" },
220 'a', " display maximum stats", 220 { 'a', " display maximum stats" },
221 'D', " dip object in pool", 221 { 'D', " dip object in pool" },
222 CTRL('L')," redraw screen", 222 { CTRL('L')," redraw screen" },
223 ESCAPE, " cancel command", 223 { ESCAPE, " cancel command" },
224 '!', " shell escape", 224 { '!', " shell escape" },
225 'S', " save game", 225 { 'S', " save game" },
226 'Q', " quit", 226 { 'Q', " quit" },
227 0, 0 227 { 0, 0 }
228 }; 228 };
229 229
230 char *s_names[MAXSCROLLS]; /* Names of the scrolls */ 230 char *s_names[MAXSCROLLS]; /* Names of the scrolls */
231 char *p_colors[MAXPOTIONS]; /* Colors of the potions */ 231 char *p_colors[MAXPOTIONS]; /* Colors of the potions */
232 char *r_stones[MAXRINGS]; /* Stone settings of the rings */ 232 char *r_stones[MAXRINGS]; /* Stone settings of the rings */