-
Notifications
You must be signed in to change notification settings - Fork 167
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.
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
Ifdef several collision changes from vanilla + improved debug free move #794
base: develop/2.4.0
Are you sure you want to change the base?
Changes from 24 commits
26e0daf
02f524b
21d3c14
96f19dc
b001875
d9ac2bf
b247c4d
abfe05b
93dceb1
182c4fd
3d677ec
068f9a5
d670157
6a3e2f6
ac663c4
032316a
eb3a4bf
751854d
d1ad8b3
2565dc7
2239f1c
0dbd237
9717468
ed921b2
da74568
57a648e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -113,6 +113,11 @@ | |
*/ | ||
#define DONT_LEDGE_GRAB_STEEP_SLOPES | ||
|
||
/** | ||
* Disables bonking on sloped ceilings by separating the handling of ceiling interactions and wall interactions. | ||
*/ | ||
#define DISABLE_CEILING_BONKS | ||
|
||
/** | ||
* Buffers an A input if you jump off a slope during the landing lag | ||
*/ | ||
|
@@ -128,7 +133,7 @@ | |
*/ | ||
// #define WATER_PLUNGE_UPWARP | ||
|
||
/** | ||
/** | ||
* This bug allows mario to move when initiating a dialog, | ||
* just as long as mario doesn't enter an action that can | ||
* be interrupted with text | ||
|
@@ -141,3 +146,14 @@ | |
*/ | ||
#define MARIO_INERTIA_UPWARD | ||
// #define MARIO_INERTIA_LATERAL | ||
|
||
/** | ||
* Improves the handling of convex wall corners by rounding wall collision at triangle edges to close the seams. | ||
* Also properly handles simultaneous collisions with multiple walls (eg. concave wall corners or narrow tunnels). | ||
*/ | ||
#define ROUNDED_WALL_CORNERS | ||
/** | ||
* Fixes an issue where entering an area above a ceiling without an intermediate floor would count as hitting a ceiling. | ||
* NOTE: This may allow Mario to clip through the wall on the deck of the the rocking JRB ship. | ||
*/ | ||
#define FIX_EXPOSED_CEILINGS | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wouldn't it make more sense to throw these into config_collision.h? Argument could be made for ceiling bonks too but that one's debatable. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved those two |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -257,6 +257,7 @@ enum SurfaceFlags { | |
SURFACE_FLAGS_NONE = (0 << 0), // 0x0000 | ||
SURFACE_FLAG_DYNAMIC = (1 << 0), // 0x0001 | ||
SURFACE_FLAG_NO_CAM_COLLISION = (1 << 1), // 0x0002 | ||
SURFACE_FLAG_X_PROJECTION = (1 << 3), // 0x0008 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why skip a number? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's how it was in vanilla, this just restores it. Should it be changed to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah it just makes more sense |
||
}; | ||
|
||
// These are effectively unique "surface" types like those defined higher | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing newline
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed