mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-04 10:11:51 -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:
+5
-5
@@ -715,11 +715,11 @@ void* Lib_SegmentedToVirtualNull(void* ptr) {
|
||||
* the NULL virtual address being 0x00000000 and not 0x80000000. Used by transition overlays, which store their
|
||||
* addresses in 24-bit fields.
|
||||
*/
|
||||
void* Lib_VirtualToPhysical(void* ptr) {
|
||||
uintptr_t Lib_VirtualToPhysical(void* ptr) {
|
||||
if (ptr == NULL) {
|
||||
return NULL;
|
||||
return 0;
|
||||
} else {
|
||||
return (void*)OS_K0_TO_PHYSICAL(ptr);
|
||||
return OS_K0_TO_PHYSICAL(ptr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -728,8 +728,8 @@ void* Lib_VirtualToPhysical(void* ptr) {
|
||||
* the NULL virtual address being 0x00000000 and not 0x80000000. Used by transition overlays, which store their
|
||||
* addresses in 24-bit fields.
|
||||
*/
|
||||
void* Lib_PhysicalToVirtual(void* ptr) {
|
||||
if (ptr == NULL) {
|
||||
void* Lib_PhysicalToVirtual(uintptr_t ptr) {
|
||||
if (ptr == 0) {
|
||||
return NULL;
|
||||
} else {
|
||||
return OS_PHYSICAL_TO_K0(ptr);
|
||||
|
||||
Reference in New Issue
Block a user