1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merged Source Code from MP branch Revision 3025 *

Browse Source 
- Shipment Bugfix: Stop time compression when shipment and email arrives
- Shipment Bugfix: Fixed duplication of items from shipment. This bug occured, when loading a savegame with at least 2 depending shipment orders



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-26 16:18:05 +00:00
parent 20c8fb646d
commit 0e078dd386
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/BobbyRMailOrder.cpp
+6 -2
View File
@@ -338,14 +338,18 @@ extern CPostalService gPostalService;
UINT8 guiNumOfDisplayedCities=0;
vector<PDestinationStruct> gDestinationTable;
vector<PShipmentStruct> gShipmentTable;
// WANNE: This method gets called when the shippment arrived
void BobbyRDeliveryCallback(RefToCShipmentManipulator ShipmentManipulator)
{
// ScreenMsg(FONT_MCOLOR_RED, MSG_DEBUG, L"Shipment from Bobby Ray has arrived at %s!", ShipmentManipulator.GetDestination().wstrName.c_str());
gusCurShipmentDestinationID = ShipmentManipulator.GetDestination().usID;
gusCurShipmentDestinationID = ShipmentManipulator.GetDestination().usID;
StopTimeCompression();
// WANNE - MP: Do not send email notification from Bobby Ray in a multiplayer game
if (!is_networked)
AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );
AddEmail( BOBBYR_SHIPMENT_ARRIVED, BOBBYR_SHIPMENT_ARRIVED_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );
}
Laptop/PostalService.cpp
+16 -10
View File
@@ -270,6 +270,7 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
if( SHIPMENT(sli).sSenderID + 2 <= (INT16)_DeliveryCallbacks.size() &&
_DeliveryCallbacks[SHIPMENT(sli).sSenderID + 1].DeliveryCallbackFunc)
{
// WANNE: This calls the BobbyRDeliveryCallback() method in BobbyRMailOrder.cpp
_DeliveryCallbacks[SHIPMENT(sli).sSenderID + 1].DeliveryCallbackFunc(*ShipmentManipulator);
}
}
@@ -331,6 +332,8 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
UINT8 ubItemsDelivered, ubTempNumItems;
UINT16 usItem;
// Loop through the packages of the order.
// A package is the sum of the same items (e.g: 5 Colts = 1 package, 2 Colts & 1 legging = 2 packages)
for(int i=0; i < (int)shs.ShipmentPackages.size(); i++)
{
ubItemsDelivered = shs.ShipmentPackages[i].ubNumber;
@@ -340,8 +343,7 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
while ( ubItemsDelivered )
{
//ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(usItem, BIGPOCK1POS) );
// Check how many items we can group together on one stack
if (UsingNewInventorySystem() == false)
{
ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(&tempObject, BIGPOCK1POS) );
@@ -351,10 +353,12 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(&tempObject, STACK_SIZE_LIMIT) );
}
// Create all the items that are grouped together
CreateItems( usItem, shs.ShipmentPackages[i].bItemQuality, ubTempNumItems, &tempObject );
if( fSectorLoaded )
{
// Add the single item to the pool
AddItemToPool( shs.pDestination->sGridNo, &tempObject, -1, 0, 0, 0 );
}
else
@@ -363,6 +367,7 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
uiCount++;
}
// Substract the number of items we already placed from the total number of items of this package
ubItemsDelivered -= ubTempNumItems;
}
}
@@ -610,13 +615,13 @@ BOOLEAN CPostalService::LoadShipmentListFromSaveGameFile(HWFILE hFile)
{
return FALSE;
}
ShipmentSaveFileDataStruct sfs;
ShipmentPackageStruct sps;
ShipmentStruct shs;
ShipmentPackageStruct sps;
for(int i = 0; i < (int)sls.uiNumberOfShipments; i++)
{
ShipmentSaveFileDataStruct sfs;
// Read in shipment data header
memset(&sfs, 0, sizeof(ShipmentSaveFileDataStruct));
uiBytesRead = 0;
@@ -625,11 +630,12 @@ BOOLEAN CPostalService::LoadShipmentListFromSaveGameFile(HWFILE hFile)
{
return FALSE;
}
// WANNE: Bugfix: Fixed CTD in VS 2008 Release EXE (by birdflu) -> This leads to item duplication!!!
//memset(&shs, 0, sizeof(ShipmentStruct));
// Add shipment
// WANNE: Bugfix: Fixed CTD in VS 2008 Release EXE (by birdflu)
//memset(&shs, 0, sizeof(ShipmentStruct));
// WANNE: This is the fix for the item duplication!
ShipmentStruct shs;
shs.pDestination = &(_GetDestination(sfs.usDestinationID));
shs.pDestinationDeliveryInfo = &(_DeliveryMethods[sfs.ubDeliveryMethodIndex].pDestinationDeliveryInfos->at(sfs.usDestinationID));
Strategic/Strategic Event Handler.cpp
+2
View File
@@ -55,6 +55,8 @@ UINT8 gubCambriaMedicalObjects;
void DropOffItemsInMeduna( UINT8 ubOrderNum );
// WANNE: Dieser Code wird nicht mehr ausgeführt. Es gibt jetzt das PostalService.cpp::DeliverShipment()
// In der Methode DeliverShipment() fehlt eine ganze Menge (PABLO Quests, ...)
void BobbyRayPurchaseEventCallback( UINT8 ubOrderID )
{
UINT8 i,j;