[Planeshift-cvs] CVS: planeshift/src/server psserverchar.cpp,1.141,1.142

[Christian S. <blu...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9871

Modified Files:
	psserverchar.cpp 
Log Message:
Locked merchant action if merchant is dead

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** psserverchar.cpp	22 Feb 2004 22:00:18 -0000	1.141
--- psserverchar.cpp	24 Feb 2004 20:19:01 -0000	1.142
***************
*** 999,1002 ****
--- 999,1012 ----
                      return;
                  }
+ 			if (!client->GetActor()->IsAlive())
+             {
+                 psserver->SendSystemInfo(client->GetClientNum(), "You're dead.");
+                 return;
+             }
+ 			if (!merchant->GetActor()->IsAlive())
+             {
+                 psserver->SendSystemInfo(client->GetClientNum(), "You can't trade with a dead merchant.");
+                 return;
+             }
  
                  // Send item list for given category
***************
*** 1044,1048 ****
                      return;
                  }
! 
                  psMoney price = item->GetPrice();
                  psMoney money = character->GetMoney();
--- 1054,1067 ----
                      return;
                  }
! 				if (!client->GetActor()->IsAlive())
! 				{
! 	                psserver->SendSystemInfo(client->GetClientNum(), "You're dead.");
! 					return;
! 				}
! 				if (!merchant->GetActor()->IsAlive())
! 				{
! 	                psserver->SendSystemInfo(client->GetClientNum(), "You can't trade with a dead merchant.");
! 					return;
! 				}
                  psMoney price = item->GetPrice();
                  psMoney money = character->GetMoney();
***************
*** 1117,1120 ****
--- 1136,1149 ----
                  if (!item)
                      return;
+ 				if (!client->GetActor()->IsAlive())
+ 				{
+ 					psserver->SendSystemInfo(client->GetClientNum(), "You're dead.");
+ 	                return;
+ 				}
+ 				if (!merchant->GetActor()->IsAlive())
+ 				{
+ 					psserver->SendSystemInfo(client->GetClientNum(), "You can't trade with a dead merchant.");
+ 	                return;
+ 				}
  
                  psMoney price = item->GetPrice();
***************
*** 1177,1180 ****
--- 1206,1219 ----
                              "view",itemName,merchantID))
              {
+ 				if (!client->GetActor()->IsAlive())
+ 				{
+ 					psserver->SendSystemInfo(client->GetClientNum(), "You're dead.");
+ 	                return;
+ 				}
+ 				if (!merchant->GetActor()->IsAlive())
+ 				{
+ 					psserver->SendSystemInfo(client->GetClientNum(), "You can't trade with a dead merchant.");
+ 	                return;
+ 				}
                  psItem * item;
                  if (tradeCommand == psGUIMerchantMessage::SELL)