Skip to content

Finish xClumpColl as Equivalent #668

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
JoshSanch merged 1 commit into from
Nov 28, 2025
Merged

Finish xClumpColl as Equivalent #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def MatchingFor(*versions):
Object(NonMatching, "SB/Core/x/xParEmitterType.cpp"),
Object(Matching, "SB/Core/x/xRenderState.cpp"),
Object(NonMatching, "SB/Game/zEntPlayerOOBState.cpp"),
Object(NonMatching, "SB/Core/x/xClumpColl.cpp"),
Object(Equivalent, "SB/Core/x/xClumpColl.cpp"),
Object(NonMatching, "SB/Core/x/xEntBoulder.cpp"),
Object(NonMatching, "SB/Core/x/xGrid.cpp"),
Object(Equivalent, "SB/Core/x/xJSP.cpp"),
Expand Down
6 changes: 6 additions & 0 deletions include/rwsdk/rpcollis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ typedef RpCollisionTriangle* (*RpIntersectionCallBackWorldTriangle)(
RpIntersection* intersection, RpWorldSector* sector, RpCollisionTriangle* collTriangle,
RwReal distance, void* data);

typedef RpAtomic* (*RpIntersectionCallBackAtomic)
(RpIntersection* intersection, RpWorldSector* sector, RpAtomic* atomic, RwReal distance, void* data);

typedef RpWorldSector* (*RpIntersectionCallBackWorldSector)
(RpIntersection* intersection, RpWorldSector* worldSector, void* data);

#ifdef __cplusplus
extern "C" {
#endif
Expand Down
Loading