Skip to content

bugfix(veterancy): Disable audiovisual cues for ejected veteran pilots #2643

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
xezon merged 3 commits into from
May 3, 2026
+8 −2
Merged

bugfix(veterancy): Disable audiovisual cues for ejected veteran pilots #2643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33c9ef6
fix(veterancy): Disable audiovisual cues for ejected veteran pilots.
Caball009 Apr 22, 2026
db3aa82
Tweaked TSH comment.
Caball009 May 2, 2026
3435602
Replicated in Generals.
Caball009 May 3, 2026
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
5 changes: 4 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,10 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
DEBUG_LOG(("Object %s inherits veterancy level %d from %s",
obj->getTemplate()->getName().str(), sourceObj->getVeterancyLevel(), sourceObj->getTemplate()->getName().str()));
VeterancyLevel v = sourceObj->getVeterancyLevel();
obj->getExperienceTracker()->setVeterancyLevel(v);

// TheSuperHackers @bugfix Caball009 22/04/2026 Disable audiovisual cues for a veterancy level change because this object was just created.
// Otherwise the cues would be at an incorrect position, because the object's matrix is not set yet.
obj->getExperienceTracker()->setVeterancyLevel(v, FALSE);

//In order to make things easier for the designers, we are going to transfer the unit name
//to the ejected thing... so the designer can control the pilot with the scripts.
Expand Down
5 changes: 4 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,10 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
DEBUG_LOG(("Object %s inherits veterancy level %d from %s",
obj->getTemplate()->getName().str(), sourceObj->getVeterancyLevel(), sourceObj->getTemplate()->getName().str()));
VeterancyLevel v = sourceObj->getVeterancyLevel();
obj->getExperienceTracker()->setVeterancyLevel(v);

// TheSuperHackers @bugfix Caball009 22/04/2026 Disable audiovisual cues for a veterancy level change because this object was just created.
// Otherwise the cues would be at an incorrect position, because the object's matrix is not set yet.
obj->getExperienceTracker()->setVeterancyLevel(v, FALSE);

//In order to make things easier for the designers, we are going to transfer the unit name
//to the ejected thing... so the designer can control the pilot with the scripts.
Expand Down
Loading