[ScryMUD] SVN Commit Info r726 - branches/version-2-1/mud/grrmud/server

[scrymud at wanfear.com]

Author: eroper
Date: 2004-12-02 04:58:09 -0800 (Thu, 02 Dec 2004)
New Revision: 726

Modified:
   branches/version-2-1/mud/grrmud/server/command2.cc
Log:
fixed vending machine price display (apparently works this time)
--Khaav


Modified: branches/version-2-1/mud/grrmud/server/command2.cc
===================================================================
--- branches/version-2-1/mud/grrmud/server/command2.cc	2004-12-02 12:03:54 UTC (rev 725)
+++ branches/version-2-1/mud/grrmud/server/command2.cc	2004-12-02 12:58:09 UTC (rev 726)
@@ -1920,7 +1920,7 @@
             price = crit_owner->findItemSalePrice(*obj_ptr, pc);
          }
          else if (obj_owner) {
-            price = obj_owner->getDefaultPrice();
+            price = obj_ptr->getDefaultPrice();
          }
          else {
             return -1;
@@ -2032,8 +2032,8 @@
          if (crit_owner) {
             price = crit_owner->findItemSalePrice(*obj_ptr, pc);
          }
-         else if (obj_owner->isVendingMachine()) {
-            price = obj_ptr->getDefaultPrice();
+         else if (obj_owner) {
+            price = obj_owner->getDefaultPrice();
          }
          else {
             return -1;