From 7bd0bda5f0c0d0d7200c6bb75c07395ebbd310e9 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 18 Sep 2006 20:30:20 +0000 Subject: [PATCH] - updated Shadow Warrior's tooltip code git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@536 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 3 +-- GameSettings.h | 2 -- GameVersion.cpp | 4 ++-- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Item Types.h | 1 + Tactical/SoldierTooltips.cpp | 31 +++---------------------------- Utils/XML_Items.cpp | 6 ++++++ 7 files changed, 13 insertions(+), 34 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index f8692eb3..a8e70096 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -536,9 +536,8 @@ void LoadGameExternalOptions() gGameExternalOptions.fVehicleInventory = iniReader.ReadBoolean("JA2 Gameplay Settings", "VEHICLE_INVENTORY", TRUE); // ShadoWarrior: Tooltip changes (start) - gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 1); + gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 2); - gGameExternalOptions.fEnableDynamicSoldierTooltips = iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE); gGameExternalOptions.fEnableSoldierTooltipLocation = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE); gGameExternalOptions.fEnableSoldierTooltipBrightness = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS", TRUE); gGameExternalOptions.fEnableSoldierTooltipRangeToTarget = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_RANGE_TO_TARGET", TRUE); diff --git a/GameSettings.h b/GameSettings.h index c5a615eb..152a8586 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -143,7 +143,6 @@ typedef struct BOOLEAN fSellAll; INT16 iPriceModifier; - INT32 iMaxIMPMaleCharacters; INT32 iMaxIMPCharacters; INT32 iMinAttribute; INT32 iMaxAttribute; @@ -351,7 +350,6 @@ typedef struct // ShadoWarrior: Tooltip changes (start) UINT8 ubSoldierTooltipDetailLevel; - BOOLEAN fEnableDynamicSoldierTooltips; BOOLEAN fEnableSoldierTooltipLocation; BOOLEAN fEnableSoldierTooltipBrightness; BOOLEAN fEnableSoldierTooltipRangeToTarget; diff --git a/GameVersion.cpp b/GameVersion.cpp index 796a203c..ef91fddb 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.529" }; + INT16 zVersionLabel[256] = { L"Release v1.13.536" }; #endif -INT8 czVersionNumber[16] = { "Build 06.09.17" }; +INT8 czVersionNumber[16] = { "Build 06.09.18" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.suo b/JA2.suo index a7f6ead5e450a8257afc6bc075bf1fbd80776ab7..1e933d5ee897ce0f69d4d9c8c4973493ba3864d0 100644 GIT binary patch delta 1039 zcmZ8eTWAz#6#l>2aVMJD&0ey}m^N`MX<5x}wVRD0QMURLqv%>Jq!cs>=|dopHReGg zq)RKw;suF6?&(Xz_Cj9TV%h=62a&2VP=k=C5D;v96I#$f)M#_@{MiK5^YhJr=3Krx z-jwar3$y(MdO7>1sEII z5c?&JQWdlD$`YYaH0*)aBOMKktV@-y^8JGGk^wG##rJE*|BNNZGGm2N%sHV6 z`Qz=aw)I=5MLH0czI)GTd>GbM3nygX^d335?3Huj3cG7^&SmP{QnW51zlQrq<=xi3 zSEeS+4>_(Bs}WSrUYIgtu3nL%c{f6eeMzS7>B`wp=iK;Kd6iiW)w&v+q8cJt8R@u& ztK@f~bR;!L=?kc!`v&5aOresx%TbXv;HH)#R62j@NPvF&m$NEC>0zWPbqZk$pT~8@ zUP9?1BlqO z+P=guu3e(mSv?3X;QTO#1_UFT;6<)krfJd0H7^=;AcBRWOkLVZOA|+1KToF!I z)yLx^Dr&^1eBz>BG>Y9Hb8ihp{R(9devJj5-unF!&DQeBqXw#J^a48RQVF)K30KR5 zkdJq68;e4t>3U=+cNTk$O?d)3b{>tSwP7FaJAym!Nk2x38SM77h_6M5=;CLe2-7z+ z_$*rni;^c%7~0UGbQx+%JX=||4mN%82Zp?PksC?!4`PQC$zT@rc?|JvGs+y_VT@z! zBDOe*L*N;=4i3yy1K`jz(0xv&?*E<2yVAjc#X6 Q{vEJ}tywtMtoEep4HF$lXaE2J delta 2013 zcmZ9NYiv|S6vyYkz1>&uF5B&vZkN7Ow3gCVQY^+QZ+VJfL`b7RK|ty=+siBP(gu~7M8He2Z7jwN@*&@r+7Aw5@ItEN{deMZ#R4*ldAbhlEL6YGZeS{FLla7YeuNl z*~ppqCR%q>=9<38otyz$0)|x+x@1jnf7+@}U1%DQJ4FXmO-C{uLL`!8VvrOoIb1R) zhtdPCsR&U{C8J3i36pdZA!A4e$s}1Mo2Zyvj(JKxS+xbHBJY+uc6g&Ta~D*V|HEb| z4+m%erhJHy6TSd(zDUQ%VycWX;7J$$-3PL z@-@La&{w4utFmwQzDk^JcA&`E$3R)?K*3v*(te`0(#o-ow383XN8|uGL=KWJ(m|B( zVU9=0C*)IdlpG_+NhkS$oFLt#hdkI*HOuU!pz8gDYA$a!y|RNk6_3T{Ni&KZ~rPc6lr1p54CQ7R<*{5h91el6J07iA@|4Yk9mLh=ld zrzf%uJk#8W?cP}ld*M~(B+Ki?$ci0r#7jU>EAn0&zLz(5V~fl#sU?z}iXI{6LndSP^!;?Q)SPa>DY*?Syhxw4- zbijkK9dWKjg{RxKY+R0hd9xKYvinQAL~JXQel6?WjCiLFYcR$RWZjuy=eVN`9>faS zv>(679uJ)I#&j%|w{|f@qV3yp02Pqk7A;QO!X2&#T(wfnxw6AUMZXSLN;6X(^;&7Ibv>`a%BsS^CQ>yq*K zU6yyD4x?jYMg1PAQk@@}{xuQjpC4BN7%2l?<87`q($RcG4P=t)|2 zFXTWma?V7NjaYUmu0sa0+0kpQT%o=M5p`l9tP2IX*1$xk)ma!iRX7FmbOYLB?PXZ8 zNCuslAzKU-Sm%2~^1KUEP^?ep1(y()$P?7k64k}3�%1XY`CZ=gKP_q7+eD{Q2s5 zS@6~uT|diBZzE5BJ|0=>vz2X5Op?K^D2Np_;40)Rn~-BQtuy2uCr-(H7q;oMT~vaV zM;hV91YJVF&AW`KPbDppf^ciQ3-Cii1kkUJcB%gt)X;Li6N@o(U``7_TkGbC*S^YVEoo(Vp_q9wzDs zqMqRvsWzz}Qa9H-OLQ%6wYYj@?pEZ+a$9ii`Q%k%lh`aainX+>t*z&^P|~~u6MPFq zmDnIw)5eQLPTqm3K9#b9%u$}Y@G=Uj@SxVJDK!w)k`zw|y*eLyeoN^)lBnlq^46L| zLRzbH3Zbx@F-R}sGridNo, sSoldierGridNo ) / 10; - if ( gGameExternalOptions.fEnableDynamicSoldierTooltips ) + // WANNE NEW + //if ( gGameExternalOptions.fEnableDynamicSoldierTooltips ) { for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ ) { @@ -297,10 +298,6 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) void DisplayWeaponInfo( SOLDIERTYPE* pSoldier, CHAR16* pStrInfo, UINT8 ubSlot, UINT8 ubTooltipDetailLevel ) { - const int TriggerGroup = 1026; - const int GunBarrelExtender = 310; - const int CMagAdapter556mm = 1001; - const int CMagAdapter9mm = 1002; INT32 iNumAttachments = 0; BOOLEAN fDisplayAttachment = FALSE; @@ -358,31 +355,9 @@ void DisplayWeaponInfo( SOLDIERTYPE* pSoldier, CHAR16* pStrInfo, UINT8 ubSlot, U if ( ubTooltipDetailLevel == DL_Basic ) { // display only externally-visible weapon attachments - // don't display inseparable attachments such as the integral GLs on OICW & AICW - if ( !Item[pSoldier->inv[ubSlot].usAttachItem[ cnt ]].inseparable ) - { - if ( pSoldier->inv[ubSlot].usAttachItem[ cnt ] != TriggerGroup ) + if ( !Item[pSoldier->inv[ubSlot].usAttachItem[ cnt ]].hiddenattachment ) { fDisplayAttachment = TRUE; - } - } - else - { - // display C-mags and barrel extensions - switch( pSoldier->inv[ubSlot].usAttachItem[ cnt ] ) - { - case GunBarrelExtender: - fDisplayAttachment = TRUE; - break; - case CMagAdapter556mm: - fDisplayAttachment = TRUE; - break; - case CMagAdapter9mm: - fDisplayAttachment = TRUE; - break; - default: - break; - } } } else diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 221660dd..ea453b07 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -117,6 +117,7 @@ itemStartElementHandle(void *userData, const char *name, const char **atts) strcmp(name, "TwoHanded") == 0 || strcmp(name, "NotBuyable") == 0 || strcmp(name, "Attachment") == 0 || + strcmp(name, "HiddenAttachment") == 0 || strcmp(name, "BigGunList") == 0 || strcmp(name, "NotInEditor") == 0 || strcmp(name, "DefaultUndroppable") == 0 || @@ -511,6 +512,11 @@ itemEndElementHandle(void *userData, const char *name) pData->curElement = ELEMENT; pData->curItem.attachment = (BOOLEAN) atol(pData->szCharData); } + else if(strcmp(name, "HiddenAttachment") == 0) + { + pData->curElement = ELEMENT; + pData->curItem.hiddenattachment = (BOOLEAN) atol(pData->szCharData); + } else if(strcmp(name, "BigGunList") == 0) { pData->curElement = ELEMENT;