MarioSwim 97%#1858
Merged
shibbo merged 7 commits intoSMGCommunity:masterfrom Jan 26, 2026
Merged
Conversation
Report for RMGK01 (e5a64e4 - 734bdd0)📈 Matched code: 40.12% (+0.20%, +10992 bytes) ✅ 5 new matches
📈 12 improvements in unmatched functions
|
ThatNintendoNerd
requested changes
Jan 26, 2026
| #include "Game/Util/SceneUtil.hpp" | ||
| #include "JSystem/JGeometry/TVec.hpp" | ||
| #include "math_types.hpp" | ||
| #include "revolution/types.h" | ||
| #include <cstddef> | ||
|
|
||
| const f32 cAnimSpeeds[4] = {1.0f, 1.0f, 1.0f, 1.0f}; |
Collaborator
There was a problem hiding this comment.
Remove the explicit array size for portability.
Comment on lines
+1430
to
+1431
| if (mJetTimer != 0) | ||
| return; |
Collaborator
There was a problem hiding this comment.
Always include curly braces for conditional blocks, even if the underlying code is only one statement.
| MR::getWaterAreaObj(&headWaterInfo, checkPos); | ||
| if (!bodyWaterInfo.isInWater() || !headWaterInfo.isInWater()) { | ||
| return false; | ||
| if (!MR::isNearZero(_184, 0.001f)) { |
Collaborator
There was a problem hiding this comment.
Remove the tolerance argument in favor of the equivalent default parameter.
| } else { | ||
| mNextAction = EXIT_ACTION_JUMP; | ||
| } | ||
| if (!MR::isNearZero(_184, 0.001f)) { |
Collaborator
There was a problem hiding this comment.
Remove the tolerance argument in favor of the equivalent default parameter.
| AreaInfo* MarioSwim::getWaterAreaInfo(WaterInfo* pInfo, const TVec3f& rPos, TVec2f* pOutVec) { | ||
| AreaInfo* waterAreaInfo = MR::getWaterAreaInfo(pInfo, rPos, getPlayer()->getAirGravityVec(), false); | ||
|
|
||
| if (pOutVec) { |
Collaborator
There was a problem hiding this comment.
Prefer an explicit comparison to nullptr for pointer null checking.
Comment on lines
+2137
to
+2147
| if (mIsOnSurface != 0) { | ||
| _36 = 20; | ||
| _30 = 50; | ||
| _7C = 45; | ||
| _2C = 30; | ||
| } else { | ||
| _36 = mActor->getConst().getTable()->mSwimSpinFrontTime; | ||
| _30 = mActor->getConst().getTable()->mSwimSpinYspeedTime; | ||
| } | ||
|
|
||
| if (mIsOnSurface == 0) { |
Collaborator
There was a problem hiding this comment.
Prefer an implicit comparison to true/false for Boolean variables.
| MR::vecKillElement(velocityPart, getGravityVec(), &direction); | ||
|
|
||
| direction.length(); | ||
| if (MR::normalizeOrZero(&direction) == 0) { |
Collaborator
There was a problem hiding this comment.
Prefer an implicit comparison to true/false for Boolean return values.
| } | ||
|
|
||
| // Wall Push / Kick Logic check | ||
| if (rNormal.dot(getGravityVec()) > 0.80000001f) { |
Collaborator
There was a problem hiding this comment.
I don't think this precision is necessary. 0.8f should suffice.
Contributor
Author
|
I pushed the requested fixes |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
No description provided.