1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

*** Merged Code from Multiplayer Branch Revision 3040 ***

Browse Source 
Bugfixes: Bobby Ray Shipment
- Re-enabled stealing from delivery sector (STEALING_FROM_SHIPMENTS_DISABLED)
- Re-enabled & externalized chance that whole shipment is lost (CHANCE_OF_SHIPMENT_LOST)
- Re-enabled delivery from John Kulba

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-28 16:51:52 +00:00
parent efa9df5930
commit cb0ceabb82
10 changed files with 190 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Game Event Hook.cpp
+4 -1
View File
@@ -181,12 +181,15 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
}
break;
case EVENT_AIM_RESET_MERC_ANNOYANCE:
ResetMercAnnoyanceAtPlayer( (UINT8) pEvent->uiParam );
ResetMercAnnoyanceAtPlayer( (UINT8) pEvent->uiParam );
break;
// WANNE: This is the EVENT for the old Bobby Ray shipment code. Look for the EVENT "EVENT_POSTAL_SERVICE_SHIPMENT" below
/*
//The players purchase from Bobby Ray has arrived
case EVENT_BOBBYRAY_PURCHASE:
BobbyRayPurchaseEventCallback( (UINT8) pEvent->uiParam);
break;
*/
//Gets called once a day ( at BOBBYRAY_UPDATE_TIME). To simulate the items being bought and sold at bobby rays
case EVENT_DAILY_UPDATE_BOBBY_RAY_INVENTORY:
DailyUpdateOfBobbyRaysNewInventory();
Strategic/Game Event Hook.h
+1 -1
View File
@@ -11,7 +11,7 @@ enum
EVENT_CHECKFORQUESTS,
EVENT_AMBIENT,
EVENT_AIM_RESET_MERC_ANNOYANCE,
EVENT_BOBBYRAY_PURCHASE,
EVENT_BOBBYRAY_PURCHASE, // WANNE: Unused (old Bobby Ray Shipment EVENT)
EVENT_DAILY_UPDATE_BOBBY_RAY_INVENTORY,
EVENT_UPDATE_BOBBY_RAY_INVENTORY,
EVENT_DAILY_UPDATE_OF_MERC_SITE,
Strategic/Strategic Event Handler.cpp
+7 -4
View File
@@ -52,9 +52,10 @@ UINT32 guiPabloExtraDaysBribed = 0;
UINT8 gubCambriaMedicalObjects;
// WANNE: No more used for the new airport code
//void DropOffItemsInMeduna( UINT8 ubOrderNum );
void DropOffItemsInMeduna( UINT8 ubOrderNum );
/*
// WANNE: Dieser Code wird nicht mehr ausgeführt. Es gibt jetzt das PostalService.cpp::DeliverShipment()
// In der Methode DeliverShipment() fehlt eine ganze Menge (PABLO Quests, ...)
void BobbyRayPurchaseEventCallback( UINT8 ubOrderID )
@@ -409,7 +410,7 @@ void BobbyRayPurchaseEventCallback( UINT8 ubOrderID )
AddEmail( JOHN_KULBA_GIFT_IN_DRASSEN, JOHN_KULBA_GIFT_IN_DRASSEN_LENGTH, JOHN_KULBA, GetWorldTotalMin(), -1 );
}
}
*/
void HandleDelayedItemsArrival( UINT32 uiReason )
@@ -1116,7 +1117,8 @@ void CheckForMissingHospitalSupplies( void )
}
// WANNE: No more used for the new airport code
/*
void DropOffItemsInMeduna( UINT8 ubOrderNum )
{
BOOLEAN fSectorLoaded = FALSE;
@@ -1218,3 +1220,4 @@ void DropOffItemsInMeduna( UINT8 ubOrderNum )
//Add an email from kulba telling the user the shipment is there
AddEmail( BOBBY_R_MEDUNA_SHIPMENT, BOBBY_R_MEDUNA_SHIPMENT_LENGTH, BOBBY_R, GetWorldTotalMin(), -1 );
}
*/
Strategic/Strategic Event Handler.h
+1 -1
View File
@@ -16,7 +16,7 @@ extern UINT8 gubCambriaMedicalObjects;
void CheckForKingpinsMoneyMissing( BOOLEAN fFirstCheck );
void CheckForMissingHospitalSupplies( void );
void BobbyRayPurchaseEventCallback( UINT8 ubOrderID );
//void BobbyRayPurchaseEventCallback( UINT8 ubOrderID );
void HandleStolenItemsReturned( void );