[Planeshift-cvs] SF.net SVN: planeshift: [413] trunk

[<ken...@us...>]

Revision: 413
          http://planeshift.svn.sourceforge.net/planeshift/?rev=413&view=rev
Author:   kennygraunke
Date:     2007-12-09 22:25:10 -0800 (Sun, 09 Dec 2007)

Log Message:
-----------
- Remove unnecessary check in ProgressionManager - I made consumable items not
  use the equip script, so we don't have to rule out false positives anymore.

Modified Paths:
--------------
    trunk/docs/history.txt
    trunk/src/server/progressionmanager.cpp

Modified: trunk/docs/history.txt
===================================================================
--- trunk/docs/history.txt	2007-12-10 04:52:46 UTC (rev 412)
+++ trunk/docs/history.txt	2007-12-10 06:25:10 UTC (rev 413)
@@ -1,3 +1,7 @@
+*** 2007-12-10 by Kenny Graunke
+- Remove unnecessary check in ProgressionManager - I made consumable items not
+  use the equip script, so we don't have to rule out false positives anymore.
+
 *** 2007-12-09 by Dave Bentham
 - Fixed FS#669: deleting GM character does not remove their Event(s) from
   the game.

Modified: trunk/src/server/progressionmanager.cpp
===================================================================
--- trunk/src/server/progressionmanager.cpp	2007-12-10 04:52:46 UTC (rev 412)
+++ trunk/src/server/progressionmanager.cpp	2007-12-10 06:25:10 UTC (rev 413)
@@ -1711,7 +1711,7 @@
         
         psItemStats * stats = item->GetItem()->GetBaseStats();
         // this is really bad.. should have specific flag?
-        if (!stats->GetIsConsumable() && (stats->GetProgressionEventEquip().Length()>0 || stats->GetProgressionEventUnEquip().Length()>0))
+        if (stats->GetProgressionEventEquip().Length() > 0 || stats->GetProgressionEventUnEquip().Length() > 0)
             psserver->SendSystemInfo(clientnum,"You found magical properties in this item !");
         else
             psserver->SendSystemInfo(clientnum,"This is an ordinary item without any magical powers.");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.