Skip to content

unify(drawable): Merge most of Drawable and Locomotor - #3097

Merged
xezon merged 4 commits into
TheSuperHackers:mainfrom
xezon:xezon/unify-loco-drawable
Aug 13, 2026
Merged

unify(drawable): Merge most of Drawable and Locomotor#3097
xezon merged 4 commits into
TheSuperHackers:mainfrom
xezon:xezon/unify-loco-drawable

Conversation

@xezon

@xezon xezon commented Aug 10, 2026

Copy link
Copy Markdown

This change is merging most of Drawable and all of Locomotor. (Is needed for #2774 to merge ambient sound related changes.)

The "Heat Vision" related code in Drawable was not merged to minimize the scope of this change.

Generals gets

  • New ambient sound logic, controls and tweaks in Drawable
  • Tint: TINT_STATUS_GAINING_SUBDUAL_DAMAGE, TINT_STATUS_FRENZY and related code in Drawable
  • Physics: IS_STUNNED
  • Locomotor: DecelerationPitchLimit, RudderCorrectionDegree, RudderCorrectionRate, ElevatorCorrectionDegree, ElevatorCorrectionRate and related code in Drawable
  • Locomotor: LOCO_MOTORCYCLE and related code in Drawable
  • Icon pos tweak in Drawable::drawEnthusiastic
  • Icon pos tweak in Drawable::drawBombed
  • Optimization in Drawable::drawConstructPercent
  • Optimization in Drawable::updateDrawableClipStatus

Comment thread Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
Comment thread Generals/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp Outdated

@Skyaero42 Skyaero42 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This looks good

Comment thread GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp Outdated
@Caball009

Caball009 commented Aug 12, 2026

Copy link
Copy Markdown

Can this change be tested against a large number of replays? I could do it myself, but I'm not sure when that'd be.

@xezon

xezon commented Aug 12, 2026

Copy link
Copy Markdown
Author

Go ahead.

@Skyaero42

Copy link
Copy Markdown

Can this change be tested against a large number of replays? I could do it myself, but I'm not sure when that'd be.

I'll do it today

Comment thread Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
@Skyaero42

Copy link
Copy Markdown

I ran about 5,000 replays without issues.

@xezon

xezon commented Aug 13, 2026

Copy link
Copy Markdown
Author

I ran about 5,000 replays without issues.

Thank you.

@xezon
xezon merged commit 4990ca9 into TheSuperHackers:main Aug 13, 2026
30 of 32 checks passed
@xezon
xezon deleted the xezon/unify-loco-drawable branch August 13, 2026 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Gen Relates to Generals Unify Unifies code between Generals and Zero Hour ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants