MERGED bugfixes from revision: 4917

- 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
-4
View File
@@ -91,9 +91,6 @@ extern INT16 APBPConstants[TOTAL_APBP_VALUES] = {0};
extern INT16 gubMaxActionPoints[28];//MAXBODYTYPES = 28... JUST GETTING IT TO WORK NOW. GOTTHARD 7/2/08
extern BOOLEAN GetCDromDriveLetter( STR8 pString );
#include "PostalService.h"
extern CPostalService gPostalService;
// The InitializeGame function is responsible for setting up all data and Gaming Engine
// tasks which will run the game
@@ -594,7 +591,6 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
SGP_THROW_IFFALSE(ReadInRoamingInfo(fileName),ROAMINGMILITIAFILENAME);
// Dealtar: Read in shipping destinations and delivery methods
gPostalService.Clear();
strcpy(fileName, directoryName);
strcat(fileName, SHIPPINGDESTINATIONSFILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));