diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2023-07-10 21:03:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 15:03:01 -0400 |
| commit | 232fdb75d88854d41d6cf0a132e0dd16b69b0f9f (patch) | |
| tree | 65e4f3313257e1e00d1e9ce36110665ca98462e6 /src/code/z_actor.c | |
| parent | d307a3723313507726d5ebcfda0b5b9cef224d91 (diff) | |
Use intptr in most remaining code files (#1438)
* Use intptr in most remaining code files
* Fix missing uintptr_t in actor
* Use u8* casts for texture pointer arithmetic
* Use bg + 1 instead of casting in Room_DrawBackground2D
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 637f7fcee..d7cd85e3e 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -731,7 +731,7 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, (u8)titleCtx->intensity, (u8)titleCtx->intensity, (u8)titleCtx->intensity, (u8)titleCtx->alpha); - gDPLoadTextureBlock(OVERLAY_DISP++, (s32)titleCtx->texture + textureLanguageOffset, G_IM_FMT_IA, G_IM_SIZ_8b, + gDPLoadTextureBlock(OVERLAY_DISP++, (u8*)titleCtx->texture + textureLanguageOffset, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -742,7 +742,7 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) { // If texture is bigger than 0x1000, display the rest if (height > 0) { - gDPLoadTextureBlock(OVERLAY_DISP++, (s32)titleCtx->texture + textureLanguageOffset + 0x1000, G_IM_FMT_IA, + gDPLoadTextureBlock(OVERLAY_DISP++, (u8*)titleCtx->texture + textureLanguageOffset + 0x1000, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -2749,7 +2749,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos ASSERT(actorId < ACTOR_ID_MAX, "profile < ACTOR_DLF_MAX", "../z_actor.c", 6883); name = overlayEntry->name != NULL ? overlayEntry->name : ""; - overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; + overlaySize = (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart; if (HREG(20) != 0) { // "Actor class addition [%d:%s]" @@ -2807,17 +2807,19 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("OVL(a):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, - (u32)overlayEntry->loadedRamAddr + (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart, - (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, name); + (uintptr_t)overlayEntry->loadedRamAddr + (uintptr_t)overlayEntry->vramEnd - + (uintptr_t)overlayEntry->vramStart, + (uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr, name); osSyncPrintf(VT_RST); overlayEntry->numLoaded = 0; } - actorInit = (void*)(u32)((overlayEntry->initInfo != NULL) - ? (void*)((u32)overlayEntry->initInfo - - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)) - : NULL); + actorInit = (void*)(uintptr_t)( + (overlayEntry->initInfo != NULL) + ? (void*)((uintptr_t)overlayEntry->initInfo - + (intptr_t)((uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr)) + : NULL); } objBankIndex = Object_GetIndex(&play->objectCtx, actorInit->objectId); |