diff rogue3/weapons.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 84651832f967
children e52a8a7ad4c5
line wrap: on
line diff
--- a/rogue3/weapons.c	Sun Feb 11 15:37:33 2018 -0500
+++ b/rogue3/weapons.c	Fri Nov 22 21:18:27 2019 -0500
@@ -38,18 +38,18 @@
     int iw_launch;
     int iw_flags;
 } init_dam[MAXWEAPONS] = {
-    "2d4", "1d3", NONE, 0,		/* Mace */
-    "1d10", "1d2", NONE,0,		/* Long sword */
-    "1d1", "1d1", NONE,	0,		/* Bow */
-    "1d1", "1d6", BOW,	ISMANY|ISMISL,	/* Arrow */
-    "1d6", "1d4", NONE,	ISMISL,		/* Dagger */
-    "1d2", "1d4", SLING,ISMANY|ISMISL,	/* Rock */
-    "3d6", "1d2", NONE,	0,		/* 2h sword */
-    "0d0", "0d0", NONE, 0,		/* Sling */
-    "1d1", "1d3", NONE,	ISMANY|ISMISL,	/* Dart */
-    "1d1", "1d1", NONE, 0,		/* Crossbow */
-    "1d2", "1d10", CROSSBOW, ISMANY|ISMISL,/* Crossbow bolt */
-    "1d8", "1d6", NONE, ISMISL,		/* Spear */
+    { "2d4", "1d3", NONE, 0 },                  /* Mace */
+    { "1d10", "1d2", NONE,0 },                  /* Long sword */
+    { "1d1", "1d1", NONE, 0 },                  /* Bow */
+    { "1d1", "1d6", BOW,  ISMANY|ISMISL },      /* Arrow */
+    { "1d6", "1d4", NONE, ISMISL },             /* Dagger */
+    { "1d2", "1d4", SLING,ISMANY|ISMISL },      /* Rock */
+    { "3d6", "1d2", NONE, 0 },                  /* 2h sword */
+    { "0d0", "0d0", NONE, 0 },                  /* Sling */
+    { "1d1", "1d3", NONE, ISMANY|ISMISL },      /* Dart */
+    { "1d1", "1d1", NONE, 0 },                  /* Crossbow */
+    { "1d2", "1d10", CROSSBOW, ISMANY|ISMISL }, /* Crossbow bolt */
+    { "1d8", "1d6", NONE, ISMISL }              /* Spear */
 };
 
 /*