Mercurial > hg > early-roguelike

comparison rogue3/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 84651832f967
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
299:74351bf23e5e 300:0250220d8cdd
36 char *iw_dam; 36 char *iw_dam;
37 char *iw_hrl; 37 char *iw_hrl;
38 int iw_launch; 38 int iw_launch;
39 int iw_flags; 39 int iw_flags;
40 } init_dam[MAXWEAPONS] = { 40 } init_dam[MAXWEAPONS] = {
41 "2d4", "1d3", NONE, 0, /* Mace */ 41 { "2d4", "1d3", NONE, 0 }, /* Mace */
42 "1d10", "1d2", NONE,0, /* Long sword */ 42 { "1d10", "1d2", NONE,0 }, /* Long sword */
43 "1d1", "1d1", NONE, 0, /* Bow */ 43 { "1d1", "1d1", NONE, 0 }, /* Bow */
44 "1d1", "1d6", BOW, ISMANY|ISMISL, /* Arrow */ 44 { "1d1", "1d6", BOW, ISMANY|ISMISL }, /* Arrow */
45 "1d6", "1d4", NONE, ISMISL, /* Dagger */ 45 { "1d6", "1d4", NONE, ISMISL }, /* Dagger */
46 "1d2", "1d4", SLING,ISMANY|ISMISL, /* Rock */ 46 { "1d2", "1d4", SLING,ISMANY|ISMISL }, /* Rock */
47 "3d6", "1d2", NONE, 0, /* 2h sword */ 47 { "3d6", "1d2", NONE, 0 }, /* 2h sword */
48 "0d0", "0d0", NONE, 0, /* Sling */ 48 { "0d0", "0d0", NONE, 0 }, /* Sling */
49 "1d1", "1d3", NONE, ISMANY|ISMISL, /* Dart */ 49 { "1d1", "1d3", NONE, ISMANY|ISMISL }, /* Dart */
50 "1d1", "1d1", NONE, 0, /* Crossbow */ 50 { "1d1", "1d1", NONE, 0 }, /* Crossbow */
51 "1d2", "1d10", CROSSBOW, ISMANY|ISMISL,/* Crossbow bolt */ 51 { "1d2", "1d10", CROSSBOW, ISMANY|ISMISL }, /* Crossbow bolt */
52 "1d8", "1d6", NONE, ISMISL, /* Spear */ 52 { "1d8", "1d6", NONE, ISMISL } /* Spear */
53 }; 53 };
54 54
55 /* 55 /*
56 * missile: 56 * missile:
57 * Fire a missile in a given direction 57 * Fire a missile in a given direction