Skip to content

unify(particlesys): Merge and move W3DParticleSys to core #3014

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 2 commits into from
Jul 27, 2026
Merged

unify(particlesys): Merge and move W3DParticleSys to core #3014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc1721
unify(particlesys): Merge W3DParticleSys (#3014)
stephanmeesters Jul 18, 2026
c5cacdf
unify(particlesys): Move W3DParticleSys to Core (#3014)
stephanmeesters Jul 18, 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
2 changes: 1 addition & 1 deletion Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/W3DGameClient.cpp
# Source/W3DDevice/GameClient/W3DInGameUI.cpp
Source/W3DDevice/GameClient/W3DMouse.cpp
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
Source/W3DDevice/GameClient/W3DParticleSys.cpp
# Source/W3DDevice/GameClient/W3DPoly.cpp
Source/W3DDevice/GameClient/W3DProfilerFrameCapture.cpp
Source/W3DDevice/GameClient/W3DPropBuffer.cpp
Expand Down
0 ...e/W3DDevice/GameClient/W3DParticleSys.cpp → ...e/W3DDevice/GameClient/W3DParticleSys.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Generals/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/W3DGameClient.cpp
Source/W3DDevice/GameClient/W3DInGameUI.cpp
# Source/W3DDevice/GameClient/W3DMouse.cpp
Source/W3DDevice/GameClient/W3DParticleSys.cpp
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
Source/W3DDevice/GameClient/W3DPoly.cpp
Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
Source/W3DDevice/GameClient/W3DScene.cpp
Expand Down
331 changes: 0 additions & 331 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/W3DGameClient.cpp
Source/W3DDevice/GameClient/W3DInGameUI.cpp
# Source/W3DDevice/GameClient/W3DMouse.cpp
Source/W3DDevice/GameClient/W3DParticleSys.cpp
# Source/W3DDevice/GameClient/W3DParticleSys.cpp
Source/W3DDevice/GameClient/W3DPoly.cpp
# Source/W3DDevice/GameClient/W3DPropBuffer.cpp
Source/W3DDevice/GameClient/W3DRoadBuffer.cpp
Expand Down
2 changes: 2 additions & 0 deletions scripts/cpp/unify_move_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,8 @@ def main():
#unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/INI/INIWater.cpp", Game.CORE, "GameEngine/Source/Common/INI/INIWater.cpp")
#unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/INI/INIWeapon.cpp", Game.CORE, "GameEngine/Source/Common/INI/INIWeapon.cpp")
#unify_file(Game.ZEROHOUR, "GameEngine/Source/Common/INI/INIWebpageURL.cpp", Game.CORE, "GameEngine/Source/Common/INI/INIWebpageURL.cpp")

#unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DParticleSys.cpp")

return

Expand Down
Loading