Skip to content

Display icon and tooltip for belt fed weapons #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Asdow merged 1 commit into from
May 26, 2023
Merged

Display icon and tooltip for belt fed weapons #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Tactical/Interface Enhanced.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,7 +2640,14 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
//////////////////// EXTERNAL FEEDING
if ( gGameExternalOptions.ubExternalFeeding )
{
if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) )
if (HasItemFlag(gpItemDescObject->usItem, BELT_FED))
{
swprintf(pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[51], szUDBGenSecondaryStatsExplanationsTooltipText[51]);
SetRegionFastHelpText(&(gUDBFasthelpRegions[iFirstDataRegion + cnt]), pStr);
MSYS_EnableRegion(&gUDBFasthelpRegions[iFirstDataRegion + cnt]);
cnt++;
}
else if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) )
{
swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[ 28 ], szUDBGenSecondaryStatsExplanationsTooltipText[ 28 ]);
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + cnt ]), pStr );
Expand Down Expand Up @@ -6340,7 +6347,13 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
//////////////////// EXTERNAL FEEDING
if ( gGameExternalOptions.ubExternalFeeding )
{
if ( ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) && !fComparisonMode ) ||
if ((HasItemFlag(gpItemDescObject->usItem, BELT_FED) && !fComparisonMode) ||
(fComparisonMode && HasItemFlag(gpComparedItemDescObject->usItem, BELT_FED)))
{
BltVideoObjectFromIndex(guiSAVEBUFFER, guiItemInfoSecondaryIcon, 28, gItemDescGenSecondaryRegions[cnt].sLeft + sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop + sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL);
cnt++;
}
else if ( ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) && !fComparisonMode ) ||
( fComparisonMode && HasItemFlag(gpComparedItemDescObject->usItem, AMMO_BELT) ) )
{
BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 28, gItemDescGenSecondaryRegions[cnt].sLeft+sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop+sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );
Expand Down
2 changes: 2 additions & 0 deletions Utils/_ChineseText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8688,6 +8688,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|医|用|夹|板", //L"|M|e|d|i|c|a|l |S|p|l|i|n|t",
L"|阻|燃|弹|药", //L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o",
L"|燃|烧|弹|药", //L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8743,6 +8744,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \n一旦应用, 这个物品可以提高对你的手臂\n或者腿部重伤的治疗速率。", //L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.",
L"\n \n这种弹药可以灭火。", //L"\n \nThis ammo can extinguish fire.",
L"\n \n这种弹药会引起燃烧（火灾）。", //L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_DutchText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8698,6 +8698,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8753,6 +8754,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_EnglishText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8688,6 +8688,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t",
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8743,6 +8744,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.",
L"\n \nThis ammo can extinguish fire.", // 49
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_FrenchText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8685,6 +8685,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8740,6 +8741,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_GermanText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8541,6 +8541,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8596,6 +8597,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_ItalianText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8688,6 +8688,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8743,6 +8744,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_PolishText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8700,6 +8700,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8755,6 +8756,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down
2 changes: 2 additions & 0 deletions Utils/_RussianText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8683,6 +8683,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
};

STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
Expand Down Expand Up @@ -8738,6 +8739,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
};

STR16 szUDBAdvStatsTooltipText[]=
Expand Down