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

- Bugfix: If user changes shipping destination location in "ShippingDestinations.xml", Bobby Ray was still under construction if the "original" shipping destination was not under players control.

Browse Source 
This occured because of hardcoded DRASSEN AIRPORT COORDINATES (BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-07-11 12:01:26 +00:00
parent 2cae5ff707
commit 826340978a
3 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Player Command.cpp
+16 -5
View File
@@ -27,10 +27,10 @@
#include "Random.h"
#endif
#include "postalservice.h"
extern BOOLEAN fMapScreenBottomDirty;
extern CPostalService gPostalService;
void GetSectorFacilitiesFlags( INT16 sMapX, INT16 sMapY, STR16 sFacilitiesString )
{
@@ -144,10 +144,21 @@ BOOLEAN SetThisSectorAsPlayerControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, B
return FALSE;
}
// check if we ever grabbed drassen airport, if so, set fact we can go to BR's
if( ( sMapX == BOBBYR_SHIPPING_DEST_SECTOR_X ) && ( sMapY == BOBBYR_SHIPPING_DEST_SECTOR_Y ) )
if (LaptopSaveInfo.fBobbyRSiteCanBeAccessed == FALSE)
{
LaptopSaveInfo.fBobbyRSiteCanBeAccessed = TRUE;
// Check if the sector is a shipment sector
BOOLEAN isShipmentSector = gPostalService.IsSectorAShipmentSector((UINT8)sMapX, (UINT8)sMapY, (UINT8)bMapZ);
if (isShipmentSector)
LaptopSaveInfo.fBobbyRSiteCanBeAccessed = TRUE;
}
// WANNE: Get Airport sector from ShippingDestination.xml file!
// check if we ever grabbed drassen airport, if so, set fact we can go to BR's
//if( ( sMapX == BOBBYR_SHIPPING_DEST_SECTOR_X ) && ( sMapY == BOBBYR_SHIPPING_DEST_SECTOR_Y ) )
if (LaptopSaveInfo.fBobbyRSiteCanBeAccessed)
{
//LaptopSaveInfo.fBobbyRSiteCanBeAccessed = TRUE;
//If the player has been to Bobbyr when it was down, and we havent already sent email, send him an email
if( LaptopSaveInfo.ubHaveBeenToBobbyRaysAtLeastOnceWhileUnderConstruction == BOBBYR_BEEN_TO_SITE_ONCE && LaptopSaveInfo.ubHaveBeenToBobbyRaysAtLeastOnceWhileUnderConstruction != BOBBYR_ALREADY_SENT_EMAIL )