From: Anders R. <ma...@us...> - 2005-11-30 23:47:48
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6829/src/server Modified Files: client.cpp psserverchar.cpp Log Message: - Changes so that when you sell/buy a item to a merchant the you sold string will have a more user friendly format. You sold X for 6 Circles and 2 Octas a total of 1600 Trias. - Moved the ToUserString psMoney function next to the ToString function. - Moved a test for no money first in the ToUserString function so that no unneeded processing would happend when calling ToUserString with a total of 0 Trias. Index: client.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/client.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** client.cpp 29 Nov 2005 07:32:38 -0000 1.102 --- client.cpp 30 Nov 2005 23:47:39 -0000 1.103 *************** *** 47,51 **** { actor = NULL; ! familiar = NULL; target = NULL; exchangeID = 0; --- 47,51 ---- { actor = NULL; ! familiar = NULL; target = NULL; exchangeID = 0; Index: psserverchar.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v retrieving revision 1.319 retrieving revision 1.320 diff -C2 -d -r1.319 -r1.320 *** psserverchar.cpp 30 Nov 2005 21:03:15 -0000 1.319 --- psserverchar.cpp 30 Nov 2005 23:47:39 -0000 1.320 *************** *** 1095,1102 **** character->SetMoney(money - cost); ! psSystemMessage mesg(client->GetClientNum(),MSG_PURCHASE,"You bought %d %s for %d trias.", boughtCount, itemName.GetData(), ! (price * boughtCount).GetTotal()); ! mesg.SendMessage(); --- 1095,1101 ---- character->SetMoney(money - cost); ! psSystemMessage mesg(client->GetClientNum(),MSG_PURCHASE,"You bought %d %s for %s a total of %d Trias.", boughtCount, itemName.GetData(), ! cost.ToUserString().GetDataSafe(),cost.GetTotal()); mesg.SendMessage(); *************** *** 1143,1147 **** return; ! csString itemName = merchantNode->GetAttributeValue("ITEM"); int count = merchantNode->GetAttributeValueAsInt("COUNT"); int merchantID = merchantNode->GetAttributeValueAsInt("ID"); --- 1142,1146 ---- return; ! csString itemName = merchantNode->GetAttributeValue("ITEM"); int count = merchantNode->GetAttributeValueAsInt("COUNT"); int merchantID = merchantNode->GetAttributeValueAsInt("ID"); *************** *** 1153,1165 **** "sell",itemName,merchantID)) { ! int itemID = merchantNode->GetAttributeValueAsInt("ITEM_ID"); psItem * item = character->Inventory().FindInBulk(itemID); if (!item) return; ! if (!merchant->GetActor()->IsAlive()) ! { ! psserver->SendSystemError(client->GetClientNum(), "You can't trade with a dead merchant."); ! return; ! } psMoney price = item->GetSellPrice(); --- 1152,1164 ---- "sell",itemName,merchantID)) { ! int itemID = merchantNode->GetAttributeValueAsInt("ITEM_ID"); psItem * item = character->Inventory().FindInBulk(itemID); if (!item) return; ! if (!merchant->GetActor()->IsAlive()) ! { ! psserver->SendSystemError(client->GetClientNum(), "You can't trade with a dead merchant."); ! return; ! } psMoney price = item->GetSellPrice(); *************** *** 1180,1187 **** character->SetMoney(money + cost); ! psSystemMessage mesg(client->GetClientNum(),MSG_PURCHASE,"You sold %d %s for %d trias.", count, itemName.GetData(), ! (price*count).GetTotal()); ! mesg.SendMessage(); --- 1179,1185 ---- character->SetMoney(money + cost); ! psSystemMessage mesg(client->GetClientNum(),MSG_PURCHASE,"You sold %d %s for %s a total of %d Trias.", count, itemName.GetData(), ! cost.ToUserString().GetDataSafe(),cost.GetTotal()); mesg.SendMessage(); *************** *** 1199,1205 **** evt.FireEvent(); ! csString buf; ! buf.Format("%s, %s, %s, \"%s\", %d, %d", client->GetName(), merchant->name.GetData(), "Sell", itemName.GetData(), count, (price * count).GetTotal()); ! psserver->GetLogCSV()->Write(CSV_EXCHANGES, buf); // items are not currently given to merchant, they are just destroyed --- 1197,1204 ---- evt.FireEvent(); ! csString buf; ! buf.Format("%s, %s, %s, \"%s\", %d, %d", client->GetName(), merchant->name.GetData(), "Sell", ! itemName.GetData(), count, (price * count).GetTotal()); ! psserver->GetLogCSV()->Write(CSV_EXCHANGES, buf); // items are not currently given to merchant, they are just destroyed *************** *** 1221,1226 **** return; ! csString itemName = merchantNode->GetAttributeValue("ITEM"); ! int merchantID = merchantNode->GetAttributeValueAsInt("ID"); int itemID = merchantNode->GetAttributeValueAsInt("ITEM_ID"); int tradeCommand = merchantNode->GetAttributeValueAsInt("TRADE_CMD"); --- 1220,1225 ---- return; ! csString itemName = merchantNode->GetAttributeValue("ITEM"); ! int merchantID = merchantNode->GetAttributeValueAsInt("ID"); int itemID = merchantNode->GetAttributeValueAsInt("ITEM_ID"); int tradeCommand = merchantNode->GetAttributeValueAsInt("TRADE_CMD"); |