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

Improved temporary Bugfix: Freeze when shippment from Bobby Rays arrive (by Arynn)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-05-10 21:12:39 +00:00
parent 4e5939a289
commit 4df4073cd0
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/PostalService.cpp
+12 -6
View File
@@ -6,6 +6,7 @@
#include "strategicmap.h" #include "strategicmap.h"
#include "random.h" #include "random.h"
#include "game clock.h" #include "game clock.h"
#include "GameSettings.h"
#include <list> #include <list>
#include <string> #include <string>
#include <iostream> #include <iostream>
@@ -315,7 +316,16 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
while ( ubItemsDelivered ) while ( ubItemsDelivered )
{ {
//ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(usItem, BIGPOCK1POS) ); //ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(usItem, BIGPOCK1POS) );
ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(&tempObject, BIGPOCK1POS) );
if (UsingNewInventorySystem() == false)
{
ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(&tempObject, BIGPOCK1POS) );
}
else
{
ubTempNumItems = __min( ubItemsDelivered, ItemSlotLimit(&tempObject, STACK_SIZE_LIMIT) );
}
CreateItems( usItem, shs.ShipmentPackages[i].bItemQuality, ubTempNumItems, &tempObject ); CreateItems( usItem, shs.ShipmentPackages[i].bItemQuality, ubTempNumItems, &tempObject );
if( fSectorLoaded ) if( fSectorLoaded )
@@ -328,11 +338,7 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
uiCount++; uiCount++;
} }
if (ubTempNumItems > 0) ubItemsDelivered -= ubTempNumItems;
ubItemsDelivered -= ubTempNumItems;
// WANNE: Temporary Bugfix, because we always get an endless loop in the while (ubTempNumItems is always 0 and therefore ubItemsDelivered always > 0!!)
else
ubItemsDelivered -= 1;
} }
} }