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

Bugfixes (by anv)

Browse Source 
- Fixed Dimitri's recruitment,
- Fixed proper morale gains/losses

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6748 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-10 16:27:21 +00:00
parent 7782384be5
commit 06123089bb
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Quests.cpp
+4 -3
View File
@@ -1074,7 +1074,7 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
|| ( gubQuest[QUEST_FOOD_ROUTE] == QUESTDONE && gGameExternalOptions.ubEarlyRebelsRecruitment[0] == 4 ) ) && IsTownUnderCompleteControlByPlayer( OMERTA ) ); || ( gubQuest[QUEST_FOOD_ROUTE] == QUESTDONE && gGameExternalOptions.ubEarlyRebelsRecruitment[0] == 4 ) ) && IsTownUnderCompleteControlByPlayer( OMERTA ) );
// silversurfer: this is the highest requirement and therefore we will automatically enable recruitment of Miguel // silversurfer: this is the highest requirement and therefore we will automatically enable recruitment of Miguel
if ( gubFact[usFact] ) if ( gubFact[usFact] )
SetFactTrue(40); // Miguel will now be willing to join and so will the other RPC SetFactTrue(FACT_MIGUEL_AND_ALL_REBELS_CAN_BE_RECRUITED); // Miguel will now be willing to join and so will the other RPC
#endif #endif
break; break;
@@ -1304,8 +1304,9 @@ BOOLEAN CheckFact( UINT16 usFact, UINT8 ubProfileID )
gubFact[usFact] = !BoxerExists(); gubFact[usFact] = !BoxerExists();
break; break;
case 245: // Can dimitri be recruited? should be true if already true, OR if Miguel has been recruited already OR is available for recruitment case FACT_DIMITRI_CAN_BE_RECRUITED: // Can dimitri be recruited? should be true if already true, OR if Miguel has been recruited already OR is available for recruitment
gubFact[usFact] = ( gubFact[usFact] || FindSoldierByProfileID( MIGUEL, TRUE ) || gubFact[40] ); gubFact[usFact] = ( gubFact[usFact] || FindSoldierByProfileID( MIGUEL, TRUE ) || gubFact[FACT_MIGUEL_AND_ALL_REBELS_CAN_BE_RECRUITED] );
break;
/* /*
case FACT_: case FACT_:
gubFact[usFact] = ; gubFact[usFact] = ;
Strategic/Quests.h
+3
View File
@@ -245,6 +245,7 @@ enum Facts
FACT_PABLO_PUNISHED_BY_PLAYER,// 37 FACT_PABLO_PUNISHED_BY_PLAYER,// 37
FACT_PABLO_RETURNED_GOODS = 39, FACT_PABLO_RETURNED_GOODS = 39,
FACT_MIGUEL_AND_ALL_REBELS_CAN_BE_RECRUITED,// 40
FACT_PABLOS_BRIBED = 41, FACT_PABLOS_BRIBED = 41,
FACT_ESCORTING_SKYRIDER,// 42 FACT_ESCORTING_SKYRIDER,// 42
@@ -437,6 +438,8 @@ enum Facts
FACT_PLAYER_OWNS_3_TOWNS_INCLUDING_OMERTA,// 243 FACT_PLAYER_OWNS_3_TOWNS_INCLUDING_OMERTA,// 243
FACT_PLAYER_OWNS_4_TOWNS_INCLUDING_OMERTA,// 244 FACT_PLAYER_OWNS_4_TOWNS_INCLUDING_OMERTA,// 244
FACT_DIMITRI_CAN_BE_RECRUITED,// 245
FACT_MALE_SPEAKING_FEMALE_PRESENT = 248, FACT_MALE_SPEAKING_FEMALE_PRESENT = 248,
FACT_HICKS_MARRIED_PLAYER_MERC,// 249 FACT_HICKS_MARRIED_PLAYER_MERC,// 249
FACT_MUSEUM_OPEN,// 250 FACT_MUSEUM_OPEN,// 250
Tactical/Morale.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ void UpdateSoldierMorale( SOLDIERTYPE * pSoldier, INT8 bMoraleEvent )
}//hayden }//hayden
ubType = gbMoraleEvent[bMoraleEvent].ubType; ubType = gbMoraleEvent[bMoraleEvent].ubType;
bMoraleMod = gReputationSettings.bValues[bMoraleEvent];//gbMoraleEvent[bMoraleEvent].bChange; bMoraleMod = gMoraleSettings.bValues[bMoraleEvent];//gbMoraleEvent[bMoraleEvent].bChange;
pProfile = &(gMercProfiles[ pSoldier->ubProfile ]); pProfile = &(gMercProfiles[ pSoldier->ubProfile ]);