From 4e5939a2894fcc6cad80ee06d43c840242e1e5ed Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 8 May 2009 21:09:26 +0000
Subject: [PATCH] Temporary Bugfix: Freeze when shippment from Bobby Rays
 arrive. It is only a temp fix, I don't know which side effects on the
 shippment this fix has.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/PostalService.cpp | 6 +++++-
 ja2_2005Express.vcproj   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Laptop/PostalService.cpp b/Laptop/PostalService.cpp
index f4312755..28c2eb20 100644
--- a/Laptop/PostalService.cpp
+++ b/Laptop/PostalService.cpp
@@ -328,7 +328,11 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
 					uiCount++;
 				}
 
-				ubItemsDelivered -= ubTempNumItems;
+				if (ubTempNumItems > 0)
+					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;
 			}
 		}
 
diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj
index acb9b17c..be849283 100644
--- a/ja2_2005Express.vcproj
+++ b/ja2_2005Express.vcproj
@@ -17,7 +17,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="D:\misc\1.13\JA2 - English"
+			OutputDirectory="C:\Games\Jagged Alliance 2 EN"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops"