Skip to content

unify(w3ddevice): Move W3DDevice/Common to Core - #3073

Merged
xezon merged 2 commits into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/w3ddevice-common
Aug 8, 2026
Merged

unify(w3ddevice): Move W3DDevice/Common to Core#3073
xezon merged 2 commits into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/w3ddevice-common

Conversation

@Jaredl-Dev

@Jaredl-Dev Jaredl-Dev commented Aug 7, 2026

Copy link
Copy Markdown

This moves the shared W3DDevice/Common files into Core:

  • W3DConvert.h
  • W3DConvert.cpp
  • W3DFunctionLexicon.h
  • W3DFunctionLexicon.cpp
  • W3DModuleFactory.h
  • W3DModuleFactory.cpp
  • W3DThingFactory.h
  • W3DThingFactory.cpp

Generals and Zero Hour differ only by product-name banners, except for W3DModuleFactory.cpp.

Generals gets:

  • Registration of the Zero Hour W3DOverlordTruckDraw, W3DOverlordAircraftDraw, W3DTreeDraw, and W3DPropDraw modules.

Verification

  • Verified all eight Core files exactly match the Zero Hour source.
  • Win32 Release build succeeds.
  • VC6 Release build succeeds.

Jaredl-Dev added a commit to Jaredl-Dev/GeneralsGameCode that referenced this pull request Aug 7, 2026
@Jaredl-Dev
unify(w3ddevice-common): Merge W3DModuleFactory from Zero Hour (TheSu…
6d644d7 
…perHackers#3073)
Jaredl-Dev added a commit to Jaredl-Dev/GeneralsGameCode that referenced this pull request Aug 7, 2026
@Jaredl-Dev
unify(w3ddevice-common): Move W3DDevice/Common to Core (TheSuperHacke…
29052fc 
…rs#3073)
@Jaredl-Dev
Jaredl-Dev force-pushed the unify/w3ddevice-common branch from f68ea49 to 29052fc Compare August 7, 2026 19:18
@xezon xezon changed the title unify(w3ddevice-common): Move W3DDevice/Common to Core unify(w3ddevice): Move W3DDevice/Common to Core Aug 8, 2026
xezon
xezon approved these changes Aug 8, 2026
View reviewed changes

@xezon xezon 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.

Good

@xezon xezon added Gen Relates to Generals ZH Relates to Zero Hour Unify Unifies code between Generals and Zero Hour labels Aug 8, 2026
@xezon

xezon commented Aug 8, 2026

Copy link
Copy Markdown

Please rename (w3ddevice-common) to (w3ddevice) in commit titles.

@Jaredl-Dev
Jaredl-Dev force-pushed the unify/w3ddevice-common branch from 29052fc to c91bc42 Compare August 8, 2026 17:55
@Jaredl-Dev

Jaredl-Dev commented Aug 8, 2026

Copy link
Copy Markdown
Author

Please rename (w3ddevice-common) to (w3ddevice) in commit titles.

Done

@xezon
xezon merged commit 1e21542 into TheSuperHackers:main Aug 8, 2026
16 checks passed
xezon pushed a commit that referenced this pull request Aug 8, 2026
@Jaredl-Dev @xezon
unify(w3ddevice): Merge W3DModuleFactory from Zero Hour (#3073)
d77e26b
@Jaredl-Dev
Jaredl-Dev deleted the unify/w3ddevice-common branch August 8, 2026 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xezon xezon xezon approved these changes

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Jaredl-Dev @xezon