NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Refactor to make surface iteration easier to make safer

Browse Source
This commit is contained in:
jaburns
2020-10-29 16:25:10 -06:00
parent 3d7bac44df
commit 5dfa2678c4
6 changed files with 72 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decomp/game/platform_displacement.c
+4 -16
View File
@@ -47,16 +47,13 @@ void update_mario_platform(void) {
switch (awayFromFloor) {
case 1:
g_state->mgMarioPlatform = NULL;
gMarioObject->platform = NULL;
break;
case 0:
if (floor != NULL && floor->object != NULL) {
g_state->mgMarioPlatform = floor->object;
gMarioObject->platform = floor->object;
if (floor != NULL && floor->transform != NULL) {
gMarioObject->platform = floor->transform;
} else {
g_state->mgMarioPlatform = NULL;
gMarioObject->platform = NULL;
}
break;
@@ -166,16 +163,7 @@ void apply_platform_displacement(u32 isMario, struct SurfaceObjectTransform *pla
* If Mario's platform is not null, apply platform displacement.
*/
void apply_mario_platform_displacement(void) {
struct SurfaceObjectTransform *platform = g_state->mgMarioPlatform;
if (gMarioObject != NULL && platform != NULL) {
apply_platform_displacement(TRUE, platform);
if (gMarioObject != NULL && gMarioObject->platform != NULL) {
apply_platform_displacement(TRUE, gMarioObject->platform);
}
}
/**
* Set Mario's platform to NULL.
*/
void clear_mario_platform(void) {
g_state->mgMarioPlatform = NULL;
}
src/decomp/game/platform_displacement.h
-1
View File
@@ -6,6 +6,5 @@
void update_mario_platform(void);
void apply_mario_platform_displacement(void);
void clear_mario_platform(void);
#endif // PLATFORM_DISPLACEMENT_H