[ScryMUD] SVN Commit Info r978 - trunk/mud/grrmud/server

[svn-log at scrymud.net]

Author: kaj
Date: 2008-03-03 14:20:02 -0800 (Mon, 03 Mar 2008)
New Revision: 978

Modified:
   trunk/mud/grrmud/server/command2.cc
Log:
Identify now needs a damage flag [41-49] in addition to an off !weapon flag (40) to call an identified object a weapon.



Modified: trunk/mud/grrmud/server/command2.cc
===================================================================
--- trunk/mud/grrmud/server/command2.cc	2008-03-03 21:36:25 UTC (rev 977)
+++ trunk/mud/grrmud/server/command2.cc	2008-03-03 22:20:02 UTC (rev 978)
@@ -2814,10 +2814,14 @@
       if (obj.OBJ_FLAGS.get(39))
          show("Shield ", pc);
       
-      if (obj.OBJ_FLAGS.get(40)) {
+      //this is ridiculous, but check for damage flags, not just !weapon
+      if (obj.OBJ_FLAGS.get(40) || !obj.OBJ_FLAGS.get(41)
+            && !obj.OBJ_FLAGS.get(42) && !obj.OBJ_FLAGS.get(43)
+            && !obj.OBJ_FLAGS.get(44) && !obj.OBJ_FLAGS.get(45) 
+            && !obj.OBJ_FLAGS.get(46) && !obj.OBJ_FLAGS.get(47) 
+            && !obj.OBJ_FLAGS.get(48) && !obj.OBJ_FLAGS.get(49)) {
          show("\nIt is not a weapon.\n", pc);
-      }
-      else {
+      } else {
          if (show_extra) {
             Sprintf(buf, "\nWeapon Damage: %id%i.\n",
                     obj.getDiceCnt(), obj.getDiceSides());