Skip to content

Conversation

@taysta
Copy link
Contributor

@taysta taysta commented Nov 19, 2024

Quickly ported from mvdevs/jk2mv@ef336f9, mvdevs/jk2mv@3cd7e53, mvdevs/jk2mv@14cb6c9
Tested in-game, appears to work as expected.

@taysta taysta requested a review from a team as a code owner November 19, 2024 10:27
@Razish Razish requested a review from Daggolin March 9, 2025 15:25
Razish
Razish previously approved these changes Mar 9, 2025
Daggolin
Daggolin previously approved these changes May 19, 2025
Copy link
Member

@Daggolin Daggolin left a comment

Choose a reason for hiding this comment

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

The code is exactly like on jk2mv and a quick test shows it's working. I personally would've preferred to have the additional ifdef as else, because they're mutually exclusive, depending on the target (openjk sp vs. openjo sp), but I am approving this so it can be merged.

Current:

#ifndef JK2_MODE
...
#endif
#ifdef JK2_MODE
...
#endif

Peferred:

#ifndef JK2_MODE
...
#else
...
#endif

When this is merged @SomaZ might have to adapt it for #1179 to keep feature parity for rd-vanilla and rd-rend2.

@taysta
Copy link
Contributor Author

taysta commented May 20, 2025

I'll make that adjustment when I get home. Thanks for reviewing.

@taysta taysta dismissed stale reviews from Daggolin and Razish via 4966aa2 May 20, 2025 14:17
@taysta taysta force-pushed the openjo-jamodels branch from 4966aa2 to aba3f2c Compare May 20, 2025 14:17
@Daggolin Daggolin merged commit 74dbea3 into JACoders:master May 20, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants