diff --git a/GameSettings.h b/GameSettings.h index 2e23f966..4edd2d6e 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -1700,6 +1700,15 @@ typedef struct UINT8 ubOmertaDropOffY; UINT8 ubOmertaDropOffZ; INT32 iOmertaDropOff; + INT32 iBobbyRDropOff; + + //BobbyR stuff + UINT8 ubBobbyRShipDestSectorX; + UINT8 ubBobbyRShipDestSectorY; + UINT8 ubBobbyRShipDestSectorZ; + INT32 iBobbyRShipDestGridNo; + INT32 iPablosStolenDestGridNo; + INT32 iLostShipmentGridNo; //[Omerta] diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index 8c758ebd..b22aa832 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -1752,11 +1752,12 @@ void HandleEquipmentLeftInDrassen( UINT32 uiSlotIndex ) if( gWorldSectorX != BOBBYR_SHIPPING_DEST_SECTOR_X || gWorldSectorY != BOBBYR_SHIPPING_DEST_SECTOR_Y || gbWorldSectorZ != BOBBYR_SHIPPING_DEST_SECTOR_Z ) { // given this slot value, add to sector item list - AddItemsToUnLoadedSector( BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z, 10433, 1, &( pItem->object ) , 0, WORLD_ITEM_REACHABLE, 0, 1, FALSE ); + AddItemsToUnLoadedSector( BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z, + gModSettings.iBobbyRDropOff, 1, &( pItem->object ) , 0, WORLD_ITEM_REACHABLE, 0, 1, FALSE ); //10433 } else { - AddItemToPool( 10433, &( pItem->object ), 1, 0, WORLD_ITEM_REACHABLE, 0 ); + AddItemToPool( gModSettings.iBobbyRDropOff, &( pItem->object ), 1, 0, WORLD_ITEM_REACHABLE, 0 ); //10433 } pItem = pItem->pNext; }