1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

MERGED bugfixes from revision: 4917

Browse Source 
- Bugfix: Bobby Ray: Shipments were not cleared when restarting a game 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-02-29 00:34:23 +00:00
parent 1bb9ed5be5
commit 74e8ecae8c
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/PostalService.cpp
+10 -7
View File
@@ -97,16 +97,19 @@ CPostalService::CPostalService()
{
}
void CPostalService::Clear()
void CPostalService::Clear(bool clearDataOnly)
{
_Shipments.clear();
_UsedShipmentIDList.clear();;
_DeliveryCallbacks.clear();
_Destinations.clear();
_UsedDestinationIDList.clear();
_DeliveryMethods.clear();
}
if (!clearDataOnly)
{
_UsedShipmentIDList.clear();;
_DeliveryCallbacks.clear();
_Destinations.clear();
_UsedDestinationIDList.clear();
_DeliveryMethods.clear();
}
}
UINT16 CPostalService::CreateNewShipment(UINT16 usDestinationID, UINT8 ubDeliveryMethodIndex, INT16 sSenderID)
{
Laptop/PostalService.h
+1 -1
View File
@@ -232,7 +232,7 @@ public:
UINT16 GetDestinationFee(UINT8 ubDeliveryMethodIndex, UINT16 usDestinationID);
RefToDeliveryMethodStruct GetDeliveryMethod(UINT8 ubDeliveryMethodIndex) const;
void Clear();
void Clear(bool clearOnlyData);
CPostalService();
private:
ShipmentList _Shipments;