[Seq-cvs-commit] showeq/src spawn.cpp, 1.35, 1.36 weapons.h, 1.6, 1.7 weapons1.h, 1.2, 1.3 weapons27.h, 1.5, 1.6 weapons28.h, 1.2, 1.3 weapons2b.h, 1.3, 1.4

[Chad M. <cmm...@us...>]

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1072/src

Modified Files:
	spawn.cpp weapons.h weapons1.h weapons27.h weapons28.h 
	weapons2b.h 
Log Message:

Weapon descriptions update from uRit.


Index: weapons.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- weapons.h	13 Sep 2005 15:23:14 -0000	1.6
+++ weapons.h	4 Nov 2006 19:00:53 -0000	1.7
@@ -143,7 +143,7 @@
     NULL,                   // 0x86 - Unknown Weapon
     NULL,                   // 0x87 - Unknown Weapon
     "Claw",                 // 0x88
-    NULL,                   // 0x89 - Unknown Weapon
+    "Tambourine",           // 0x89 - Unknown Weapon
     NULL,                   // 0x8a - Unknown Weapon
     NULL,                   // 0x8b - Unknown Weapon
     "Ragebringer",          // 0x8c
@@ -256,7 +256,7 @@
     NULL,                   // 0xf7 - Unknown Weapon
     NULL,                   // 0xf8 - Unknown Weapon
     NULL,                   // 0xf9 - Unknown Weapon
-    NULL,                   // 0xfa - Unknown Weapon
+    "Lollipop",             // 0xfa - Unknown Weapon
     NULL,                   // 0xfb - Unknown Weapon
     NULL,                   // 0xfc - Unknown Weapon
     NULL,                   // 0xfd - Unknown Weapon

Index: weapons28.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons28.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- weapons28.h	13 Sep 2005 15:23:14 -0000	1.2
+++ weapons28.h	4 Nov 2006 19:00:53 -0000	1.3
@@ -134,7 +134,6 @@
     NULL,                 // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

Index: spawn.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawn.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- spawn.cpp	4 Nov 2006 17:44:08 -0000	1.35
+++ spawn.cpp	4 Nov 2006 19:00:53 -0000	1.36
@@ -92,6 +92,12 @@
 #include "weapons2b.h"
   };
 
+  // sparse array of item names (in 0x2c range), some are NULL
+  static const char*  itemnames2c[] = 
+  {
+#include "weapons2c.h"
+  };
+
   // assume no material name found
   const char *itemStr = NULL;
 
@@ -140,6 +146,12 @@
     if (itemLo < (sizeof(itemnames2b) / sizeof (char*)))
       itemStr = itemnames2b[itemLo];
   }
+  else if (itemHi == 0x2c)
+  {
+    // retrieve pointer to item name
+    if (itemLo < (sizeof(itemnames2c) / sizeof (char*)))
+      itemStr = itemnames2c[itemLo];
+  }
 
   // if race name exists, then return it, otherwise return a number string
   if (itemStr != NULL)

Index: weapons27.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons27.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- weapons27.h	13 Sep 2005 15:23:14 -0000	1.5
+++ weapons27.h	4 Nov 2006 19:00:53 -0000	1.6
@@ -134,7 +134,6 @@
     "Bone Spear",         // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

Index: weapons2b.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons2b.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- weapons2b.h	30 Sep 2006 21:18:26 -0000	1.3
+++ weapons2b.h	4 Nov 2006 19:00:53 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * weapons2bh
+ * weapons2b.h
  *
  * ShowEQ Distributed under GPL
  * http://seq.sourceforge.net/
@@ -134,7 +134,6 @@
     NULL,                 // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82

Index: weapons1.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/weapons1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- weapons1.h	13 Sep 2005 15:23:14 -0000	1.2
+++ weapons1.h	4 Nov 2006 19:00:53 -0000	1.3
@@ -134,7 +134,6 @@
     NULL,                 // 0x7d
     NULL,                 // 0x7e
     NULL,                 // 0x7f
-
     NULL,                 // 0x80
     NULL,                 // 0x81
     NULL,                 // 0x82