Skip to content

Unit & infantry auto-conversion on ammo change #1653

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

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
+70 −0
Open

Unit & infantry auto-conversion on ammo change #1653

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
17457c9
Initial commit
FS-21 May 5, 2025
85c6f39
Merge branch 'develop' into feature/ammo_conversion
FS-21 May 19, 2025
4c09c34
docs update
FS-21 May 19, 2025
8e4ae98
Improved code
FS-21 May 19, 2025
e75dc6b
Merge branch 'develop' into feature/ammo_conversion
FS-21 May 23, 2025
b5c1f6c
Applied feedback
FS-21 May 29, 2025
ddda6e2
Merge branch 'develop' into feature/ammo_conversion
FS-21 May 29, 2025
3f21f51
Applied feedback
FS-21 May 29, 2025
1143847
Merge branch 'develop' into feature/ammo_conversion
FS-21 May 30, 2025
0710234
Applied feedback
FS-21 May 30, 2025
b5bcccc
Merge branch 'develop' into feature/ammo_conversion
FS-21 Jun 8, 2025
b9deb2d
Merge remote-tracking branch 'origin/develop' into feature/ammo_conve…
FS-21 Jul 6, 2025
8bf36b8
Merge branch 'develop' into feature/ammo_conversion
FS-21 Aug 7, 2025
c3d0f3f
Merge branch 'develop' into feature/ammo_conversion
FS-21 Sep 2, 2025
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
2 changes: 1 addition & 1 deletion src/Ext/Techno/Body.Update.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void TechnoExt::ExtData::AmmoAutoConvertActions()
if ((skipMinimum || pThis->Ammo >= pTypeExt->Ammo_AutoConvertMinimumAmount) // More than minimum
&& (skipMaximum || pThis->Ammo <= pTypeExt->Ammo_AutoConvertMaximumAmount)) // Less than maximum
{
const auto pFoot = abstract_cast<FootClass*>(pThis);
const auto pFoot = pThis && (pThis->AbstractFlags & AbstractFlags::Foot) ? static_cast<FootClass*>(pThis) : nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const auto pFoot = abstract_cast<FootClass* , true >(pThis); is a method of using encapsulated functions, which can be directly used.

Copy link
Contributor Author

@FS-21 FS-21 May 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But you are suggesting a code change or simply explaining a recommendation for future similar situations? is for going direct & closing the pending conversation :-P

Copy link
Contributor

@CrimRecya CrimRecya May 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to do sanity check on pThis. You have already used pThis->Ammo and are even still using pThis->GetTechnoType(), it cannot be empty.
I explained for a while just to make you understand what the true in abstract_cast means.

Copy link
Contributor Author

@FS-21 FS-21 May 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok now I understood, so I'll leave as
const auto pFoot = abstract_cast<FootClass*, true>(pThis);
because as you said pThis was already used and the last bit of information i wanted to know is if pThis is a FootClass object or something else for future things.

Copy link
Contributor

@CrimRecya CrimRecya May 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if pThis is a FootClass object or something else for future things.

Sorry, I didn't understand what you meant. pThis is a TechnoClass pointer and the converted pFoot is a FootClass pointer. Unless it is not a Foot (such as a Building), they all point to the same entity.


if (!pFoot)
return;
Expand Down