From 1b25b0f0931a44dc511fbc69d3189aa79a6d8797 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 5 Nov 2006 00:32:06 +0000 Subject: [PATCH] - bugfix: CTD when trying to recruit John & Mary and there is only one free place left in the whole team. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@617 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Interface Dialogue.cpp | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/JA2.suo b/JA2.suo index 112b2ce4b0fac0771c7ef840bd6de08f914c12b1..59dd9d8a281052e2e5291a2f4ada9aeff55636e7 100644 GIT binary patch delta 3057 zcmb7`e@vBC7{|}^-j~a-_x|AC3tj>7qM}HsmHf@nON*fBXhwuiS-8bIAyPvn z4%m2%)ybDz_o%O;$@lYE{;f65H6UFUvvO9)8rTjz85`iqHuvHIX;_NRYF5j3$!-T8 z8=+aDcUGWQE4!tG0#*q<>7ZVAc`I#YnC&FgEkI6J&Xx~5O0;OBW302mS)$2?Yn-N; zu=Fc7e#=?J{mu-t9q+PNvi*(W+#Idz*^3m8%NgdVf87 z%T3SlzA-}ZO$`u=Rb?_Vn)@+5gH&kdP06<@_R?sM{nuh#OjMN1C$ z`865y@^i{hE`!25+^5awulw`(P_Kt~RoOf2REV(ND@W=$O*u4L%M6T}A`*!_CluO9 ziPzxh61WV00zZQRFbH^Eg-ey|=dBeU!s4D18H1D~`m@O{UOYoq-qvfTMmdZaT1YNY zc81Kp(<*JI6dCGuYy;xCR*&o|J+4#l?)5D*Q!WX*L2>dJ%Kg|bra0*x@q8L3`g$Vh zT~mZSMWajgHE1+wp(DO^@$_-KSU*T{ysbtRZk48|hXu}UCG-(!tlE@AQPLD~CB4hi zQ`1NnY8#0ypUM))whUK*U{`@z2XBW#fl42e&l=+N#t) z126e2Ir4Yp=s$rfFRhVRahJFbChD!y35;z4Z|kilMC=>DEL-MMjJ(Cft=2em0tU?> zy-M&DuF7iU3G|)>x~t^miMWP=(em}t`Hq`keDn+2t&4t(>LO95Qn}cAiVjn)eo=V8 gk2EoGmfUiQqc@-_Jlztd5IdOK^5$haa#>0L56jxOLjV8( delta 1942 zcma)7TTE0}6y5vI432W=!OT!#csNp}7K~MEEh?#qh^=CU`bg7Qr^v%lhnI|vP)n!% zX!vOqPG$SikI86l6KgeG&3x1*m@tU11_?o%Gz}m9FsVs3(xkzZ=|1^FAnud+KHjL~bZr#3Nqi5T zM$AQ|SMK49^c(l-(G}c4Lxt$1hTCZ8?5V-43$PRe(KzB>H0tWA`j&h}=n*Fmo5}k< z=1t?sR0^BX+S7rqXrCG1!)44T(YAB%5VZ3iHt`kEcd;3ELom822{$9OIAE>va+8N6-9$8{%S)Jt@Pr>E{cp|j`W{++`qWkVk}dmKhmJZbOqVn@%T#$ zupRZ*xp5f7MZ?mbut53(6!784@G7i<&As^{B$pYN)7UpGLg5b>rjzF|U^7Wgxyk2x zdVCfyimE3WwDki1NPTxPorWvX)8oYo6eM{O{*3P$AS=$}2!+pJp@ciuvk5(CLivg` zm$5v67e(kvc>*kru3f;?l>JZwM|Jntz<$m)fVI$yVoT2`_DRnH{dt17?yV8b(E3*Q zA!g8>e#}w6L(%Lj$K$6qV+;9X_-4XRE0Y^o^`m^CYN3@X)6p$w?{mJk4j>J_p4Q8& z5%Lbvb zOtia8n9D)F+Tb17#;h8dQ}GD;=R)Kd5RqpW<@ksTI?AWMPJc1f&VVE;T5N!wB=re9sQYg$n+LLTj*317q%&pf z+<03J7u{B8TnF$x@XTjVE2YpK{Dqud=%NGNXq9`jhdvp>+*R{-F>ki(FZ24BpS8Zl z4;9cvb%S_#ZV7V^&U^?33TO0j_<0khv0B-)RnSO{gV>Ot5On$f=3?`+7iwARhH02; z(Hl!o*`e(`E6Y#-qx?4MCU;3#Z9ZQ(&jNA_wg^M08nl1Oz#3?(Fx>MSpuPS~O z)$%!Of@8Dr_UIban?5uw%+#NU>zcuJwDM<3dPKUU9%@Lvj_*^;Cfs6sed;ABpLMik O0&jeAAJ5%aR{RUKnku&d diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index 04acbca7..85a428d6 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -4475,8 +4475,9 @@ void DialogueMessageBoxCallBack( UINT8 ubExitValue ) { if ( ubProfile == JOHN ) { + // WANNE: Bugfix: CTD when recruting John and Mary and there is only one place left in the team. // Mary might be alive, and if so we need to ensure two places - pSoldier = FindSoldierByProfileID( MARY, TRUE ); + pSoldier = FindSoldierByProfileID( MARY, FALSE ); if ( pSoldier && !PlayerTeamHasTwoSpotsLeft() ) { ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[ CANNOT_RECRUIT_TEAM_FULL ] );