print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

2.0.8 (fix more compiler warnings) (#543)

Browse Source 
* fix Waddress in mario_step.c

* fix Winfinite-recursion in unused dynlist_proc function

* in fact remove the offending function entirely

* fix warnings in RNC decompress functions

* update version

* fix version in VERSION.txt

premature on my part, will update it to 2.0.10 next time

Co-authored-by: someone2639 <someone2639@gmail.com>
This commit is contained in:
someone2639
2022-12-06 15:41:55 -05:00
committed by GitHub
parent a15db3c56b
commit 7ef2077353
5 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@@ -1 +1 @@
v2.0.7
v2.0.8

2
src/boot/rnc1.s
View File

@@ -412,4 +412,4 @@ make_huftable8:
jr ra
nop /*(Delay Slot) */
.end
.end Propack_UnpackM1

6
src/boot/rnc2.s
View File

@@ -663,11 +663,11 @@ unpack11:
jr ra
nop
.data
.end Propack_UnpackM2
.data
.align 4
.word 0,0,0,0,0,0,0,0,0,0,0,0
mystack:
.word 0
.end

2
src/game/mario_step.c
View File

@@ -541,7 +541,7 @@ s32 perform_air_quarter_step(struct MarioState *m, Vec3f intendedPos, u32 stepAr
}
}
if (stepResult == AIR_STEP_GRABBED_LEDGE && grabbedWall != NULL && ledgeFloor != NULL && ledgePos != NULL) {
if (stepResult == AIR_STEP_GRABBED_LEDGE && grabbedWall != NULL && ledgeFloor != NULL) {
vec3f_copy(m->pos, ledgePos);
set_mario_floor(m, floor, ledgePos[1]);
m->faceAngle[0] = 0x0;

41
src/goddard/dynlist_proc.c
View File

@@ -1895,47 +1895,6 @@ void d_set_att_offset(const struct GdVec3f *off) {
}
}
/**
* An incorrectly-coded recursive function that was presumably supposed to
* set the offset of an attached object. Now, it will only call itself
* until it encounters a NULL pointer, which will trigger a `fatal_printf()`
* call.
*
* @note Not called
*/
void d_set_att_to_offset(UNUSED u32 a) {
struct GdObj *dynobj; // sp3c
UNUSED u8 filler[24];
if (sDynListCurObj == NULL) {
fatal_printf("proc_dynlist(): No current object");
}
dynobj = sDynListCurObj;
d_stash_dynobj();
switch (sDynListCurObj->type) {
case OBJ_TYPE_JOINTS:
set_cur_dynobj(((struct ObjJoint *) dynobj)->attachedToObj);
break;
case OBJ_TYPE_NETS:
set_cur_dynobj(((struct ObjNet *) dynobj)->attachedToObj);
break;
case OBJ_TYPE_PARTICLES:
set_cur_dynobj(((struct ObjParticle *) dynobj)->attachedToObj);
break;
default:
fatal_printf("%s: Object '%s'(%x) does not support this function.", "dSetAttToOffset()",
sDynListCurInfo->name, sDynListCurObj->type);
}
if (sDynListCurObj == NULL) {
fatal_printf("dSetAttOffset(): Object '%s' isnt attached to anything",
sStashedDynObjInfo->name);
}
d_set_att_to_offset(a);
d_unstash_dynobj();
}
/**
* Store the offset of the attached object into `dst`.
*