Skip to content

Commit ad51270

Browse files
committed
zRumble: 100% and Link
1 parent cd77ffb commit ad51270

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ def MatchingFor(*versions):
511511
Object(NonMatching, "SB/Game/zPlatform.cpp", extra_cflags=["-sym on"]),
512512
Object(Matching, "SB/Game/zPortal.cpp"),
513513
Object(Matching, "SB/Game/zRenderState.cpp"),
514-
Object(Equivalent, "SB/Game/zRumble.cpp"),
514+
Object(Matching, "SB/Game/zRumble.cpp"),
515515
Object(Equivalent, "SB/Game/zSaveLoad.cpp"),
516516
Object(NonMatching, "SB/Game/zScene.cpp"),
517517
Object(Matching, "SB/Game/zScript.cpp"),

src/SB/Game/zRumble.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,10 @@ void zRumbleStartDistance(S32 pad_id, F32 real_dist, F32 max_dist, _tagRumbleTyp
108108
}
109109
}
110110

111-
// Equivalent: regalloc
112111
void zRumbleStartEntDistance(xEnt* ent, F32 dist, _tagRumbleType type, F32 maxTime)
113112
{
114-
xVec3* ent_pos = xEntGetPos(ent);
115-
xVec3* player_pos = xEntGetPos(&globals.player.ent);
116113
xVec3 ent_player_dist;
117-
xVec3Sub(&ent_player_dist, player_pos, ent_pos);
114+
xVec3Sub(&ent_player_dist, xEntGetPos(&globals.player.ent), xEntGetPos(ent));
118115

119116
zRumbleStartDistance(globals.currentActivePad, SQR(ent_player_dist.x) + SQR(ent_player_dist.z),
120117
SQR(dist), type, maxTime);

0 commit comments

Comments
 (0)