mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-21 07:52:21 -04:00
Enable -Wint-conversion warning (#1266)
* fixing some warnings * more pointer fixing * Use `-Wno-int-conversion` on audio files * more progress * fix * more pointer fixes * kinda progress * Fix remaining casts * Format * fix merge * fix warnings * fix parameter * use SEGMENT_ROM_START_OFFSET a bit more * format * fix audio warnings * some more fixes * fix en_go * review * review * whoops, missing cast * review * review * ->data * format * review * fix * asPtr * fix * Update src/code/sched.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * fix in EnDnh * improve format * engo * format * fix * format * Update include/z64.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * TexturePtr * fix warnings * fix warnings * format * fix * review --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
@@ -43,9 +43,9 @@ void func_80178AC0(u16* src, void* dst, size_t size) {
|
||||
}
|
||||
}
|
||||
|
||||
void CmpDma_GetFileInfo(u8* segmentRom, s32 id, uintptr_t* outFileRom, size_t* size, s32* flag) {
|
||||
u32 dataStart;
|
||||
u32 refOff;
|
||||
void CmpDma_GetFileInfo(uintptr_t segmentRom, s32 id, uintptr_t* outFileRom, size_t* size, s32* flag) {
|
||||
uintptr_t dataStart;
|
||||
uintptr_t refOff;
|
||||
|
||||
DmaMgr_DmaRomToRam(segmentRom, &sDmaBuffer.dataStart, sizeof(sDmaBuffer.dataStart));
|
||||
|
||||
@@ -53,12 +53,12 @@ void CmpDma_GetFileInfo(u8* segmentRom, s32 id, uintptr_t* outFileRom, size_t* s
|
||||
refOff = id * sizeof(u32);
|
||||
|
||||
// if id is >= idMax
|
||||
if (refOff > (dataStart - 4)) {
|
||||
if (refOff > (dataStart - sizeof(u32))) {
|
||||
*outFileRom = segmentRom;
|
||||
*size = 0;
|
||||
} else if (refOff == 0) {
|
||||
// get offset start of next file, i.e. size of first file
|
||||
DmaMgr_DmaRomToRam(segmentRom + 4, &sDmaBuffer.dataSize, sizeof(sDmaBuffer.dataSize));
|
||||
DmaMgr_DmaRomToRam(segmentRom + sizeof(u32), &sDmaBuffer.dataSize, sizeof(sDmaBuffer.dataSize));
|
||||
*outFileRom = segmentRom + dataStart;
|
||||
*size = sDmaBuffer.dataSize;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user