summaryrefslogtreecommitdiff
path: root/src/render_player.c
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2025-05-23 16:53:14 -0600
committerGitHub <noreply@github.com>2025-05-23 16:53:14 -0600
commit2a0c0939c780babc45c8c22dfd6f94563485bae5 (patch)
tree0a8f7d6a5a99452645260d53e778204327275deb /src/render_player.c
parent9363e3d77631b1028a765c075a00293bd20c9ba7 (diff)
Refactor World::Courses to unique_ptr (#211)
* wip course unique ptr * Track unique_ptr : This probably compiles * Finish impl Courses as unique_ptr * Fix error * Fixes * More fixes * Cleanup * Remove old vars --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/render_player.c')
-rw-r--r--src/render_player.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render_player.c b/src/render_player.c
index ca4247ef9..5061826f6 100644
--- a/src/render_player.c
+++ b/src/render_player.c
@@ -1277,7 +1277,7 @@ void change_player_color_effect_cmy(UNUSED Player* player, s8 arg1, s32 arg2, f3
* Sort of an atmospheric effect.
*/
bool is_player_under_light_luigi_raceway(Player* player, s8 arg1) {
- if (GetCourse() == GetLuigiRaceway()) {
+ if (IsLuigiRaceway()) {
if (((gNearestWaypointByPlayerId[arg1] >= 0x14F) && (gNearestWaypointByPlayerId[arg1] < 0x158)) ||
((gNearestWaypointByPlayerId[arg1] >= 0x15E) && (gNearestWaypointByPlayerId[arg1] < 0x164)) ||
((gNearestWaypointByPlayerId[arg1] >= 0x169) && (gNearestWaypointByPlayerId[arg1] < 0x170)) ||
@@ -1295,7 +1295,7 @@ bool is_player_under_light_luigi_raceway(Player* player, s8 arg1) {
}
void render_light_environment_on_player(Player* player, s8 arg1) {
- if (GetCourse() == GetBowsersCastle()) {
+ if (IsBowsersCastle()) {
if (((gNearestWaypointByPlayerId[arg1] >= 0x15) && (gNearestWaypointByPlayerId[arg1] < 0x2A)) ||
((gNearestWaypointByPlayerId[arg1] >= 0x14D) && (gNearestWaypointByPlayerId[arg1] < 0x15C)) ||
((gNearestWaypointByPlayerId[arg1] >= 0x1D1) && (gNearestWaypointByPlayerId[arg1] < 0x1E4)) ||
@@ -1318,7 +1318,7 @@ void render_light_environment_on_player(Player* player, s8 arg1) {
change_player_color_effect_cmy(player, arg1, 0, 0.3f);
D_80164B80[arg1] = 0;
}
- } else if (GetCourse() == GetBansheeBoardwalk()) {
+ } else if (IsBansheeBoardwalk()) {
if (((gNearestWaypointByPlayerId[arg1] >= 0xD) && (gNearestWaypointByPlayerId[arg1] < 0x15)) ||
((gNearestWaypointByPlayerId[arg1] >= 0x29) && (gNearestWaypointByPlayerId[arg1] < 0x39)) ||
((gNearestWaypointByPlayerId[arg1] >= 0x46) && (gNearestWaypointByPlayerId[arg1] < 0x4E)) ||