mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-06-17 15:36:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong types

Browse Source
This commit is contained in:
KiritoDv
2024-05-22 23:40:48 -06:00
committed by Sonic Dreamcaster
parent c01884f0c4
commit 3ca7b499ae
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_std_lib.c
-12
View File
@@ -599,11 +599,7 @@ void Lib_TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32
(s32) (1.0f / yScale * 1024.0f));
}
<<<<<<< HEAD
void Lib_TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
=======
void TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
f32 yScale) {
gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -617,11 +613,7 @@ void TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32
(s32) (1.0f / yScale * 1024.0f));
}
<<<<<<< HEAD
void Lib_TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
=======
void TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
f32 yScale) {
gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -635,11 +627,7 @@ void TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
<<<<<<< HEAD
void Lib_TextureRect_IA8(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
=======
void TextureRect_IA8(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);