From b5601c78d9c043ac6ec37e39a5fe2614bd94e166 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 12 Nov 2006 16:24:53 +0000 Subject: [PATCH] updated soldier tooltips git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@629 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Laptop/email.cpp | 30 +++++++++++++++--------------- Tactical/SoldierTooltips.cpp | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/JA2.suo b/JA2.suo index e0ee4317f970ab26c846ab70ef7782660ba76745..94cf2ade6ccdd58239846ce698bca6f3066878ee 100644 GIT binary patch delta 1803 zcmah}eN2^Q6n}p2eHE@;?!9p38|gxZ7%LG+X_;QKk3l#Xf+2JAc^4*LFCQTiQ|!aB zVH@lnoLVl~*lKM!t-HJ}{vn1i-1yK62jezqOI@|;+WNy$(0Sf_FG9I`w&&|S=XuUK zzu!4eTf3>P-E^f^HBa4pXQ^rZC=5af$NQcZHCJ6{=5;D1UxLju7ka?}t9HtC1}@J7 zlLba6AJ%bKwFtA#cqBoH8tw&hr#Z~0)Wv8aw6j{2O$b9M>%A!|L?+K4OZmb_Q9KPu z19>cWi$-yRM;2*TOYH6e6EBNdcvRGi1}To@p@=oBbYT^*YNc2{@Up08J^4Vr6nUyG zohrbsUEqoi^?mJ@|A)gaaDmEn!8HHQddPskBU%A19G*_V=6tP;z_Dh z;qVTsX#0$AzK7W0K`Ob2kV>;aEDiSKo2d2dZi6V{aaE(qer%^qAd{x*V5XmLD4CS@ zonob_bX=#5Y2`UOeJil_+OMEc@eWdg1|>sV-ui9#7bp&~ivt{Z z6WK@6OeKqo&3kVePN;T87^q-TNx&;)AHxil??57b?n7aO5HVuh(1i^`EH5Vq^=M!c zvsAuEiI!Ri>4QmF)Rf>U_Q+R8b>Bit#C}fiGV1Zcx%Rck*XqyM_OWxvnGMO!8^Xox z)R1*qse<1*>br^A@Ep!^C#yB+$MLcYHHAuk_)Z( z`#iK#vWi`FaSSCgGqVnhY>~r`O3Tu&KPy^A>pB52Kh-)*tB~L-3OFT^2&)utaV^%e zV~zBQ4;AFQ&46&3`IWrv)_$m5a)CWZ@)GFc409!Ez>7NUmVcxt_4-gwjzz_!Mg^~; zNUHuy_jhsyG4@6N2&04N-p9sJ3^L7gTF9rBB4|l-dGufuAIhw&*Y&A+A#mQ9SPydD7%#hO$hMpY>E7wZ( zYqkUYw*2p2V+&56*&5w=7n>-3l%slKQL(6rD|h^+Xz(d6fr)3ifF7pZrl1mCo)E~Bu^r2daffs}eAkMp+?6TZgMxx4uE Hu9EmSvFQBU delta 1490 zcmaJ=e@t6d6u#ekkMXNNp+IGbg)xLJOeAhjAX0;4hM};CKbA2CDdHTm4m1(mw8SOb zAIk)9*vT>yr!g8cAREo7f8S4)e&6w3zLss)46ZF?dk4h;|)L;-QwAjbX5nXDvFc3+xgu=IH`$I^=bkyEVjm z|42^OV3P6n`>^6g?lgwdUoTYZW4xV}u1@dDmkOx<1vq5e%ue~{vPmvDGQF-VeGgrB zU;#APk0jYWWg1rC23C3+-Z`Tojz0Seh4frMa$><}3E`2L+D%IXut>{!4RyY84P770 zpU$RI#t4$=_Ypix{(g*@!}Q3&_oC1RWYI7ENF~oGoWp}?(~K`}SS9GTm@ZXep1QMH zk8P8HZ@- zIEty&i*h-%>rpDWfz#xF5C*zu5l7?)g@sf#%87JralE_5DT}tbWKDj?&^C{n5wohL zw~7#HB2Q~qIJi(~lOj~=8^v9ezoI1ioayjG7X47Faj3R?OOw_@CS z$5G83Q$kZrsq#lCzK&Tu11&2m?3-q1{I7@rg{*NUcaytU#rZvR$t&ZCjW#}KcX*NFL7 zc=OBw#YCa&s57p`Vu>;|AzYB|yeb@}OE#oXO(~LkKZ1##pTuLm9^_JK9 znl-wWQ^Iu$V2Z5MXx5UVxbM~&nn8blvz|JK&bwf(4!`z;{9If4X*)KD# z^0H#qY*7u?E~bSE+=$u3x9rf<-9Tl2PWRlm5m}DB@_!?@QIQ4dx_Tqk%|>?7uRp>j z3oA;gU=pY3d{A-F{y9E>aU<^b1=4X77H-$;YR_uX(xMUhKDmZ!X!hv(UqTr&dn%V6 z9_2$$EGtLXYn~IXIc;50zD}&*DmC%V8^ud!LQ3;GX>*w5V^Zlq+9g*vC$1I83LPl|v`WgYcCHl`l5_4Ijb3hX4Qo diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 8989067b2..c7254ba5f 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -3200,16 +3200,16 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr -#define IMP_RESULTS_INTRO_LENGTH 9 +#define IMP_RESULTS_INTRO_LENGTH 9 -#define IMP_RESULTS_PERSONALITY_INTRO IMP_RESULTS_INTRO_LENGTH +#define IMP_RESULTS_PERSONALITY_INTRO IMP_RESULTS_INTRO_LENGTH // 0 - 9 #define IMP_RESULTS_PERSONALITY_INTRO_LENGTH 5 -#define IMP_PERSONALITY_NORMAL IMP_RESULTS_PERSONALITY_INTRO + IMP_RESULTS_PERSONALITY_INTRO_LENGTH +#define IMP_PERSONALITY_NORMAL IMP_RESULTS_PERSONALITY_INTRO + IMP_RESULTS_PERSONALITY_INTRO_LENGTH // 14 - 18 #define IMP_PERSONALITY_LENGTH 4 -#define IMP_PERSONALITY_HEAT IMP_PERSONALITY_NORMAL + IMP_PERSONALITY_LENGTH -#define IMP_PERSONALITY_NERVOUS IMP_PERSONALITY_HEAT + IMP_PERSONALITY_LENGTH -#define IMP_PERSONALITY_CLAUSTROPHOBIC IMP_PERSONALITY_NERVOUS + IMP_PERSONALITY_LENGTH -#define IMP_PERSONALITY_NONSWIMMER IMP_PERSONALITY_CLAUSTROPHOBIC + IMP_PERSONALITY_LENGTH +#define IMP_PERSONALITY_HEAT IMP_PERSONALITY_NORMAL + IMP_PERSONALITY_LENGTH // 19 - 22 +#define IMP_PERSONALITY_NERVOUS IMP_PERSONALITY_HEAT + IMP_PERSONALITY_LENGTH // 23 - 26 +#define IMP_PERSONALITY_CLAUSTROPHOBIC IMP_PERSONALITY_NERVOUS + IMP_PERSONALITY_LENGTH // 27 - 30 +#define IMP_PERSONALITY_NONSWIMMER IMP_PERSONALITY_CLAUSTROPHOBIC + IMP_PERSONALITY_LENGTH // 31 - 34 #define IMP_PERSONALITY_FEAR_OF_INSECTS IMP_PERSONALITY_NONSWIMMER + IMP_PERSONALITY_LENGTH #define IMP_PERSONALITY_FORGETFUL IMP_PERSONALITY_FEAR_OF_INSECTS + IMP_PERSONALITY_LENGTH + 1 #define IMP_PERSONALITY_PSYCHO IMP_PERSONALITY_FORGETFUL + IMP_PERSONALITY_LENGTH @@ -3222,7 +3222,7 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr #define IMP_ATTITUDE_OPTIMIST IMP_ATTITUDE_LONER + IMP_ATTITUDE_LENGTH + 1 #define IMP_ATTITUDE_PESSIMIST IMP_ATTITUDE_OPTIMIST + IMP_ATTITUDE_LENGTH + 1 #define IMP_ATTITUDE_AGGRESSIVE IMP_ATTITUDE_PESSIMIST + IMP_ATTITUDE_LENGTH + 1 -#define IMP_ATTITUDE_ARROGANT IMP_ATTITUDE_AGGRESSIVE + IMP_ATTITUDE_LENGTH + 1 +#define IMP_ATTITUDE_ARROGANT IMP_ATTITUDE_AGGRESSIVE + IMP_ATTITUDE_LENGTH + 1 /// 88 #define IMP_ATTITUDE_ASSHOLE IMP_ATTITUDE_ARROGANT + IMP_ATTITUDE_LENGTH + 1 #define IMP_ATTITUDE_COWARD IMP_ATTITUDE_ASSHOLE + IMP_ATTITUDE_LENGTH #define IMP_RESULTS_SKILLS IMP_ATTITUDE_COWARD + IMP_ATTITUDE_LENGTH + 1 @@ -3234,32 +3234,32 @@ BOOLEAN HandleMailSpecialMessages( UINT16 usMessageId, INT32 *iResults, EmailPtr #define IMP_SKILLS_IMPERIAL_MED IMP_SKILLS_IMPERIAL_SKILLS + 4 #define IMP_SKILLS_NEED_TRAIN_SKILLS IMP_SKILLS_IMPERIAL_MED + 1 -#define IMP_SKILLS_NEED_TRAIN_MARK IMP_SKILLS_NEED_TRAIN_SKILLS + 1 +#define IMP_SKILLS_NEED_TRAIN_MARK IMP_SKILLS_NEED_TRAIN_SKILLS + 1 // 119 #define IMP_SKILLS_NEED_TRAIN_MECH IMP_SKILLS_NEED_TRAIN_SKILLS + 2 #define IMP_SKILLS_NEED_TRAIN_EXPL IMP_SKILLS_NEED_TRAIN_SKILLS + 3 #define IMP_SKILLS_NEED_TRAIN_MED IMP_SKILLS_NEED_TRAIN_SKILLS + 4 #define IMP_SKILLS_NO_SKILL IMP_SKILLS_NEED_TRAIN_MED + 1 -#define IMP_SKILLS_NO_SKILL_MARK IMP_SKILLS_NO_SKILL + 1 +#define IMP_SKILLS_NO_SKILL_MARK IMP_SKILLS_NO_SKILL + 1 // 124 #define IMP_SKILLS_NO_SKILL_MECH IMP_SKILLS_NO_SKILL + 2 #define IMP_SKILLS_NO_SKILL_EXPL IMP_SKILLS_NO_SKILL + 3 -#define IMP_SKILLS_NO_SKILL_MED IMP_SKILLS_NO_SKILL + 4 +#define IMP_SKILLS_NO_SKILL_MED IMP_SKILLS_NO_SKILL + 4 // 127 -#define IMP_SKILLS_SPECIAL_INTRO IMP_SKILLS_NO_SKILL_MED + 1 +#define IMP_SKILLS_SPECIAL_INTRO IMP_SKILLS_NO_SKILL_MED + 1 // 128, 129 #define IMP_SKILLS_SPECIAL_INTRO_LENGTH 2 -#define IMP_SKILLS_SPECIAL_LOCK IMP_SKILLS_SPECIAL_INTRO + IMP_SKILLS_SPECIAL_INTRO_LENGTH +#define IMP_SKILLS_SPECIAL_LOCK IMP_SKILLS_SPECIAL_INTRO + IMP_SKILLS_SPECIAL_INTRO_LENGTH // 130 #define IMP_SKILLS_SPECIAL_HAND IMP_SKILLS_SPECIAL_LOCK + 1 #define IMP_SKILLS_SPECIAL_ELEC IMP_SKILLS_SPECIAL_HAND + 1 #define IMP_SKILLS_SPECIAL_NIGHT IMP_SKILLS_SPECIAL_ELEC + 1 #define IMP_SKILLS_SPECIAL_THROW IMP_SKILLS_SPECIAL_NIGHT + 1 #define IMP_SKILLS_SPECIAL_TEACH IMP_SKILLS_SPECIAL_THROW + 1 #define IMP_SKILLS_SPECIAL_HEAVY IMP_SKILLS_SPECIAL_TEACH + 1 -#define IMP_SKILLS_SPECIAL_AUTO IMP_SKILLS_SPECIAL_HEAVY + 1 +#define IMP_SKILLS_SPECIAL_AUTO IMP_SKILLS_SPECIAL_HEAVY + 1 // 137 #define IMP_SKILLS_SPECIAL_STEALTH IMP_SKILLS_SPECIAL_AUTO + 1 #define IMP_SKILLS_SPECIAL_AMBI IMP_SKILLS_SPECIAL_STEALTH + 1 #define IMP_SKILLS_SPECIAL_THIEF IMP_SKILLS_SPECIAL_AMBI + 1 #define IMP_SKILLS_SPECIAL_MARTIAL IMP_SKILLS_SPECIAL_THIEF + 1 -#define IMP_SKILLS_SPECIAL_KNIFE IMP_SKILLS_SPECIAL_MARTIAL + 1 +#define IMP_SKILLS_SPECIAL_KNIFE IMP_SKILLS_SPECIAL_MARTIAL + 1 // 142 // WANNE: These 2 skills are missing in the email! // The problem is, that there is no description in binarydata\impass.edt diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index cee19b85d..1d3936380 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -96,8 +96,8 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) } else { - // beyond visual range, do not display tooltip if player has not chosen debug details - if ( ubTooltipDetailLevel < DL_Debug ) + // beyond visual range, do not display tooltip if player has not chosen full or debug details + if ( ubTooltipDetailLevel < DL_Full ) return; } } // fMercIsUsingScope is false @@ -105,7 +105,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) // WANNE: Check if enemy soldier is in line of sight but only if player has not choosen debug details - if ( ubTooltipDetailLevel < DL_Debug) + if ( ubTooltipDetailLevel < DL_Full) { // Get the current selected merc SOLDIERTYPE* pMerc = MercPtrs[ gusSelectedSoldier ];