Mercurial > hg > early-roguelike

comparison rogue4/weapons.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 1b73a8641b37
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
299:74351bf23e5e 300:0250220d8cdd
21 char *iw_dam; /* Damage when wielded */ 21 char *iw_dam; /* Damage when wielded */
22 char *iw_hrl; /* Damage when thrown */ 22 char *iw_hrl; /* Damage when thrown */
23 char iw_launch; /* Launching weapon */ 23 char iw_launch; /* Launching weapon */
24 int iw_flags; /* Miscellaneous flags */ 24 int iw_flags; /* Miscellaneous flags */
25 } init_dam[MAXWEAPONS] = { 25 } init_dam[MAXWEAPONS] = {
26 "2d4", "1d3", NONE, 0, /* Mace */ 26 { "2d4", "1d3", NONE, 0 }, /* Mace */
27 "3d4", "1d2", NONE, 0, /* Long sword */ 27 { "3d4", "1d2", NONE, 0 }, /* Long sword */
28 "1d1", "1d1", NONE, 0, /* Bow */ 28 { "1d1", "1d1", NONE, 0 }, /* Bow */
29 "1d1", "2d3", BOW, ISMANY|ISMISL, /* Arrow */ 29 { "1d1", "2d3", BOW, ISMANY|ISMISL },/* Arrow */
30 "1d6", "1d4", NONE, ISMISL, /* Dagger */ 30 { "1d6", "1d4", NONE, ISMISL }, /* Dagger */
31 "4d4", "1d2", NONE, 0, /* 2h sword */ 31 { "4d4", "1d2", NONE, 0 }, /* 2h sword */
32 "1d1", "1d3", NONE, ISMANY|ISMISL, /* Dart */ 32 { "1d1", "1d3", NONE, ISMANY|ISMISL },/* Dart */
33 "1d1", "1d1", NONE, 0, /* Crossbow */ 33 { "1d1", "1d1", NONE, 0 }, /* Crossbow */
34 "1d2", "2d5", CROSSBOW, ISMANY|ISMISL, /* Crossbow bolt */ 34 { "1d2", "2d5", CROSSBOW, ISMANY|ISMISL },/* Crossbow bolt */
35 "2d3", "1d6", NONE, ISMISL, /* Spear */ 35 { "2d3", "1d6", NONE, ISMISL } /* Spear */
36 }; 36 };
37 37
38 /* 38 /*
39 * missile: 39 * missile:
40 * Fire a missile in a given direction 40 * Fire a missile in a given direction