unify: Merge common systems code needed for ParticleSystem #2180
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
added
Gen
xezon
force-pushed
the
xezon/unify-particlesystem-dependencies
branch
from
d608106 to
4f79927
Compare
xezon
changed the title
xezon
commented
Jan 24, 2026
| //------------------------------------------------------------------------------------------------- | ||
| void ScriptEngine::parseScriptCondition( INI* ini ) | ||
| { | ||
| } |
Author
There was a problem hiding this comment.
The merged parse functions are intentionally left empty. To be merged fully another time.
| #define INT_TO_REAL(x) ((Real)(x)) | ||
|
|
||
| // once we've ceiled/floored, trunc and round are identical, and currently, round is faster... (srj) | ||
| #if RTS_GENERALS /*&& RETAIL_COMPATIBLE_CRC*/ |
Author
There was a problem hiding this comment.
This is not ideal, but alright because BaseType.h cannot see RETAIL_COMPATIBLE_CRC. This code can be removed when we remove RETAIL_COMPATIBLE_CRC.
I do not know if ZH and GEN effectively produce the same code with the different functions and it is not worth the risk to guess.
xezon
added a commit
that referenced
this pull request
Jan 24, 2026
xezon
added a commit
that referenced
this pull request
Jan 24, 2026
xezon
added a commit
that referenced
this pull request
Jan 24, 2026
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge with Rebase
This change merges the code of several common systems needed for ParticleSystem. The merges are split into 4 commits.
Generals gets, among some other details
TODO