Skip to content

Conversation

@xezon
Copy link

@xezon xezon commented Nov 23, 2025

Merge with Rebase

This change merges and moves ObjectStatusTypes, Radar, W3DRadar to Core.

Is split into 3 commits.

Generals gets the following - not yet functional - object statuses:

  • OBJECT_STATUS_DECK_HEIGHT_OFFSET
  • OBJECT_STATUS_RIDER1
  • OBJECT_STATUS_RIDER2
  • OBJECT_STATUS_RIDER3
  • OBJECT_STATUS_RIDER4
  • OBJECT_STATUS_RIDER5
  • OBJECT_STATUS_RIDER6
  • OBJECT_STATUS_RIDER7
  • OBJECT_STATUS_RIDER8
  • OBJECT_STATUS_FAERIE_FIRE
  • OBJECT_STATUS_MISSILE_KILLING_SELF
  • OBJECT_STATUS_REASSIGN_PARKING
  • OBJECT_STATUS_BOOBY_TRAPPED
  • OBJECT_STATUS_IMMOBILE
  • OBJECT_STATUS_DISGUISED
  • OBJECT_STATUS_DEPLOYED

Generals gets the following Radar changes:

  1. Minor performance optimization in Radar::newMap
  2. Minor performance optimization in W3DRadar::buildTerrainTexture
  3. Radar object render condition change regarding disguised objects

@xezon xezon added this to the Code foundation build up milestone Nov 23, 2025
@xezon xezon added Gen Relates to Generals ZH Relates to Zero Hour Unify Unifies code between Generals and Zero Hour labels Nov 23, 2025
Copy link

@Skyaero42 Skyaero42 left a comment

Choose a reason for hiding this comment

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

This looks good

@xezon xezon merged commit b68c0b9 into TheSuperHackers:main Nov 24, 2025
24 checks passed
xezon added a commit that referenced this pull request Nov 24, 2025
@xezon xezon deleted the xezon/unify-radar branch November 24, 2025 22:17
fbraz3 added a commit to fbraz3/GeneralsX that referenced this pull request Nov 24, 2025
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.

2 participants