I am going to list all the patches in a table/spreadsheet so we can sort, group, filter and review. I don't know if we can reinstate ja2-stracciatella/ja2-ub-comparison and make this the "upstream".Ĭurrently, all diffs in the main modules (Tactical/Strategic/TileEngine/Laptop/etc) are reconciled, except Utils/, sgp/ and Editor/. However, it is not indexed or searchable on GitHub, as it is a downstream fork. The patches can be reviewed at this repo. Those are the important part.Īfter almost 200 patches, I think we are now in a better position to talk about UB support again. Once the diffs of type (1), negligible, are let go, only game logic changes should be left. + //Ja25: if the merc is an AIM merc return false cause aim mercs are hired "indefinately" + if( pSoldier->ubWhatKindOfMercAmI = MERC_TYPE_AIM_MERC ) + return( FALSE ) + + Void HandleUniqueEventWhenPlayerLeavesTeam( SOLDIERTYPE *pSoldier -1505,6 +1582,11 get hour contract is going to expire. PurchaseOrExtendInsuranceForSoldier( gpInsuranceSoldier, gubContractLength -1449,6 +1525,7 = NULL If( ( pLeaveSoldier->ubWhatKindOfMercAmI = MERC_TYPE_AIM_MERC ) & ( ubQuitType != HISTORY_MERC_FIRED ) -1437,6 +1510,9 ExtendMercInsuranceContractCallBack( UINT8 bExitValue ) aim merc will say goodbye when leaving + + // ATE: Remove strategic event + if ( pSoldier->ubProfile != NO_PROFILE ) + HandleImportantMercQuote( pSoldier, QUOTE_ACCEPT_CONTRACT_RENEWAL -859,7 +862,17 ) check if player can afford insurance, if not, tell -417,6 +419,7 no need to query for life insurance If( ( pSoldier->usLifeInsurance ) & ( pSoldier->bAssignment != ASSIGNMENT_POW ) ) // DEF: Removed cause they can extend a 1 day contract & ( iContractLength > 1 ) PSoldier->iEndofContractTime += ( iContractLength * 1440 ) Void MercDepartEquipmentBoxCallBack( UINT8 bExitValue ) īOOLEAN HandleFiredDeadMerc( SOLDIERTYPE *pSoldier -391,6 +391,8 the end of the contract Void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldier, BOOLEAN fAddRehireButton ) a/ja2-ub-comparison/src_ja2/game/Strategic/Merc Contract.c +++ b/ja2-ub-comparison/src_ub/game/Strategic/Merc Contract.c -38,7 +38,7 CalculateMedicalDepositRefund( SOLDIERTYPE *pSoldier ) +//JA25: void CalculateMedicalDepositRefund( SOLDIERTYPE *pSoldier )
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |