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

- Missing changes for revision 6500 (by Buggler)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-16 10:53:15 +00:00
parent 772e99924a
commit 7ccdd5f7ab
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.h
+9
View File
@@ -1700,6 +1700,15 @@ typedef struct
UINT8 ubOmertaDropOffY; UINT8 ubOmertaDropOffY;
UINT8 ubOmertaDropOffZ; UINT8 ubOmertaDropOffZ;
INT32 iOmertaDropOff; INT32 iOmertaDropOff;
INT32 iBobbyRDropOff;
//BobbyR stuff
UINT8 ubBobbyRShipDestSectorX;
UINT8 ubBobbyRShipDestSectorY;
UINT8 ubBobbyRShipDestSectorZ;
INT32 iBobbyRShipDestGridNo;
INT32 iPablosStolenDestGridNo;
INT32 iLostShipmentGridNo;
//[Omerta] //[Omerta]
Strategic/Map Screen Interface.cpp
+3 -2
View File
@@ -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 ) 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 // 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 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; pItem = pItem->pNext;
} }