mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-17 12:59:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix a lot of warning in code (#598)

Browse Source 
* Fix warnings
* Fix building
This commit is contained in:
coco875
2024-04-16 18:00:08 +02:00
committed by GitHub
parent d9c1ebb626
commit 9ac20c80b8
58 changed files with 893 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/racing/collision.c
+12 -12
View File
@@ -635,18 +635,18 @@ void func_802AC114(Vec3f pos1, f32 boundingBoxSize, Vec3f pos2, UNUSED f32 unk)
s32 func_802AC22C(KartBoundingBoxCorner *arg0) {
Collision spD0;
s32 stackPadding0;
s32 stackPadding1;
s32 stackPadding2;
s32 stackPadding3;
s32 stackPadding4;
s32 stackPadding5;
s32 stackPadding6;
s32 stackPadding7;
s32 stackPadding8;
s32 stackPadding9;
s32 stackPaddingA;
s32 stackPaddingB;
UNUSED s32 stackPadding0;
UNUSED s32 stackPadding1;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
UNUSED s32 stackPadding4;
UNUSED s32 stackPadding5;
UNUSED s32 stackPadding6;
UNUSED s32 stackPadding7;
UNUSED s32 stackPadding8;
UNUSED s32 stackPadding9;
UNUSED s32 stackPaddingA;
UNUSED s32 stackPaddingB;
s32 temp1;
s32 temp2;
f32 temp_f22;
src/racing/collision.h
+1
View File
@@ -19,6 +19,7 @@ s16 func_802ABDB8(u16);
s16 func_802ABDF4(u16);
f32 func_802ABE30(f32, f32, f32, u16);
f32 func_802ABEAC(Collision*, Vec3f);
void shell_collision(Collision *, Vec3f);
void process_shell_collision(Vec3f, f32, Vec3f, f32);
u16 process_collision(Player*, KartBoundingBoxCorner*, f32, f32, f32);
void func_802AC114(Vec3f, f32, Vec3f, f32);
src/racing/math_util.c
+2 -2
View File
@@ -25,10 +25,10 @@ UNUSED s32 func_802B4F60(UNUSED s32 arg0, Vec3f arg1, UNUSED s32 arg2, UNUSED f3
sp28 = sp1C[0];
sp2C = sp1C[1];
// wut?
if (sp2C && sp2C);
if (sp2C && sp2C) {};
sp2C = ((sp30[0][3] * sp28) + (sp30[1][3] * sp2C) + (sp30[2][3] * sp1C[2])) + sp30[3][3];
// double wut?
if (sp28 && sp28);
if (sp28 && sp28) {};
mtxf_translate_vec3f_mat4(sp1C, sp30);
if (0.0f >= sp2C)
{
src/racing/math_util.h
+1
View File
@@ -35,6 +35,7 @@ void add_translate_mat4_vec3f(Mat4, Mat4, Vec3f);
void add_translate_mat4_vec3f_lite(Mat4, Mat4, Vec3f);
void mtxf_translate(Mat4, Vec3f);
void func_802B5564(Mat4, u16*, f32, f32, f32, f32, f32);
void func_802B5794(Mat4, Vec3f, Vec3f);
void mtxf_rotate_x(Mat4, s16);
void mtxf_rotate_y(Mat4, s16);
void mtxf_s16_rotate_z(Mat4, s16);
src/racing/memory.c
+2 -2
View File
@@ -1335,7 +1335,7 @@ u8 *load_course(s32 courseId) {
CourseVtx *vertexStart; // mio0 compressed
u8 *packedStart;
u32 vertexCount;
uintptr_t finalDisplaylistOffset;
u8* finalDisplaylistOffset;
u32 unknown1;
s32 prevLoadedAddress_saved;
u8 *offsetRomStart;
@@ -1371,7 +1371,7 @@ u8 *load_course(s32 courseId) {
set_segment_base_addr(0xF, (void *) vtxCompressed);
decompress_vtx(vertexStart, vertexCount);
displaylist_unpack((uintptr_t *) packedStart, finalDisplaylistOffset, unknown1);
displaylist_unpack((uintptr_t *) packedStart, (uintptr_t) finalDisplaylistOffset, unknown1);
decompress_textures(textures);
gNextFreeMemoryAddress = prevLoadedAddress_saved;
return vtxCompressed;
src/racing/render_courses.c
+13 -13
View File
@@ -1424,13 +1424,13 @@ void func_80295D88(void) {
switch (gCurrentCourseId) {
case COURSE_MARIO_RACEWAY:
// d_course_mario_raceway_packed_dl_1140
set_vertex_data_with_defaults((uintptr_t)0x07001140);
set_vertex_data_with_defaults((Gfx *)0x07001140);
if (gScreenModeSelection == SCREEN_MODE_1P) {
// d_course_mario_raceway_packed_dl_8E8
set_vertex_data_with_defaults((uintptr_t)0x070008E8);
set_vertex_data_with_defaults((Gfx *)0x070008E8);
} else {
// d_course_mario_raceway_packed_dl_2D68
set_vertex_data_with_defaults((uintptr_t)0x07002D68);
set_vertex_data_with_defaults((Gfx *)0x07002D68);
}
parse_course_displaylists((uintptr_t) d_course_mario_raceway_addr);
func_80295C6C();
@@ -1485,7 +1485,7 @@ void func_80295D88(void) {
D_8015F8E4 = -80.0f;
break;
case COURSE_YOSHI_VALLEY:
func_802B5D64(&d_course_yoshi_valley_lights4, -0x38F0, 0x1C70, 1);
func_802B5D64((uintptr_t) &d_course_yoshi_valley_lights4, -0x38F0, 0x1C70, 1);
parse_course_displaylists((uintptr_t) d_course_yoshi_valley_addr);
func_80295C6C();
D_8015F8E4 = gCourseMinY - 10.0f;
@@ -1585,22 +1585,22 @@ void func_80295D88(void) {
break;
case COURSE_BLOCK_FORT:
// d_course_block_fort_packed_dl_15C0
set_vertex_data_with_default_section_id((uintptr_t)0x070015C0, 1);
set_vertex_data_with_default_section_id((Gfx *)0x070015C0, 1);
func_80295C6C();
D_8015F8E4 = gCourseMinY - 10.0f;
break;
case COURSE_SKYSCRAPER:
// d_course_skyscraper_packed_dl_1110
set_vertex_data_with_default_section_id((uintptr_t)0x07001110, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07001110, 1);
// d_course_skyscraper_packed_dl_258
set_vertex_data_with_default_section_id((uintptr_t)0x07000258, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07000258, 1);
func_80295C6C();
D_8015F8E4 = -480.0f;
break;
case COURSE_DOUBLE_DECK:
// d_course_double_deck_packed_dl_738
set_vertex_data_with_default_section_id((uintptr_t)0x07000738, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07000738, 1);
func_80295C6C();
D_8015F8E4 = gCourseMinY - 10.0f;
break;
@@ -1613,15 +1613,15 @@ void func_80295D88(void) {
break;
case COURSE_BIG_DONUT:
// d_course_big_donut_packed_dl_1018
set_vertex_data_with_default_section_id((uintptr_t)0x07001018, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07001018, 6);
// d_course_big_donut_packed_dl_450
set_vertex_data_with_default_section_id((uintptr_t)0x07000450, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000450, 6);
// d_course_big_donut_packed_dl_AC0
set_vertex_data_with_default_section_id((uintptr_t)0x07000AC0, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000AC0, 6);
// d_course_big_donut_packed_dl_B58
set_vertex_data_with_default_section_id((uintptr_t)0x07000B58, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000B58, 6);
// d_course_big_donut_packed_dl_230
set_vertex_data_with_default_section_id((uintptr_t)0x07000230, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000230, 6);
func_80295C6C();
D_8015F8E4 = 100.0f;
break;