github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added system to check if color tunics is turned on.

Browse source
This commit is contained in:
Baoulettes 2022-04-28 06:21:06 +02:00 • committed by GitHub
commit 4282b1c89e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
soh/src/code/z_player_lib.c
View file

@ -743,25 +743,28 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
#else #else
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[eyeIndex])); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[eyeIndex]));
#endif #endif
if (tunic == PLAYER_TUNIC_KOKIRI) { if (CVar_GetS32("gUseTunicsCol",0) != 1) { //Mod is not on bring back original colors.
Color_RGB8 sTemp = { CVar_GetS32("gTunic_Kokiri_R", &sTunicColors[PLAYER_TUNIC_KOKIRI].r), color = &sTunicColors[tunic];
CVar_GetS32("gTunic_Kokiri_G", &sTunicColors[PLAYER_TUNIC_KOKIRI].g), }
CVar_GetS32("gTunic_Kokiri_B", &sTunicColors[PLAYER_TUNIC_KOKIRI].b) }; if (tunic == PLAYER_TUNIC_KOKIRI && CVar_GetS32("gUseTunicsCol",0) ==1 ) {
Color_RGB8 sTemp = { CVar_GetS32("gTunic_Kokiri_R", sTunicColors[PLAYER_TUNIC_KOKIRI].r),
CVar_GetS32("gTunic_Kokiri_G", sTunicColors[PLAYER_TUNIC_KOKIRI].g),
CVar_GetS32("gTunic_Kokiri_B", sTunicColors[PLAYER_TUNIC_KOKIRI].b) };
color = &sTemp; color = &sTemp;
} else if (tunic == PLAYER_TUNIC_GORON) { } else if (tunic == PLAYER_TUNIC_GORON && CVar_GetS32("gUseTunicsCol",0) ==1 ) {
Color_RGB8 sTemp = { CVar_GetS32("gTunic_Goron_R", &sTunicColors[PLAYER_TUNIC_GORON].r), Color_RGB8 sTemp = { CVar_GetS32("gTunic_Goron_R", sTunicColors[PLAYER_TUNIC_GORON].r),
CVar_GetS32("gTunic_Goron_G", &sTunicColors[PLAYER_TUNIC_GORON].g), CVar_GetS32("gTunic_Goron_G", sTunicColors[PLAYER_TUNIC_GORON].g),
CVar_GetS32("gTunic_Goron_B", &sTunicColors[PLAYER_TUNIC_GORON].b) }; CVar_GetS32("gTunic_Goron_B", sTunicColors[PLAYER_TUNIC_GORON].b) };
color = &sTemp; color = &sTemp;
} else if (tunic == PLAYER_TUNIC_ZORA) { } else if (tunic == PLAYER_TUNIC_ZORA && CVar_GetS32("gUseTunicsCol",0) ==1 ) {
Color_RGB8 sTemp = { CVar_GetS32("gTunic_Zora_R", &sTunicColors[PLAYER_TUNIC_ZORA].r), Color_RGB8 sTemp = { CVar_GetS32("gTunic_Zora_R", sTunicColors[PLAYER_TUNIC_ZORA].r),
CVar_GetS32("gTunic_Zora_G", &sTunicColors[PLAYER_TUNIC_ZORA].g), CVar_GetS32("gTunic_Zora_G", sTunicColors[PLAYER_TUNIC_ZORA].g),
CVar_GetS32("gTunic_Zora_B", &sTunicColors[PLAYER_TUNIC_ZORA].b) }; CVar_GetS32("gTunic_Zora_B", sTunicColors[PLAYER_TUNIC_ZORA].b) };
color = &sTemp; color = &sTemp;
} else { } else if (CVar_GetS32("gUseTunicsCol",0) == 1) {
Color_RGB8 sTemp = { CVar_GetS32("gTunic_Kokiri_R", &sTunicColors[PLAYER_TUNIC_KOKIRI].r), Color_RGB8 sTemp = { CVar_GetS32("gTunic_Kokiri_R", sTunicColors[PLAYER_TUNIC_KOKIRI].r),
CVar_GetS32("gTunic_Kokiri_G", &sTunicColors[PLAYER_TUNIC_KOKIRI].g), CVar_GetS32("gTunic_Kokiri_G", sTunicColors[PLAYER_TUNIC_KOKIRI].g),
CVar_GetS32("gTunic_Kokiri_B", &sTunicColors[PLAYER_TUNIC_KOKIRI].b) }; CVar_GetS32("gTunic_Kokiri_B", sTunicColors[PLAYER_TUNIC_KOKIRI].b) };
color = &sTemp; color = &sTemp;
} }
gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0); gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0);