mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-10-31 23:55:06 -04:00
Code Issues Projects Releases Wiki Activity

var name update (creative name I know...)

Browse Source
This commit is contained in:
Baoulettes 2022-04-27 04:35:31 +02:00 committed by GitHub
parent 2656d119b7
commit 6db237fbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
soh/src/code/z_message_PAL.c
View File

@ -507,7 +507,7 @@ void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
static s16 sIconEnvR = 0; static s16 sIconEnvR = 0;
static s16 sIconEnvG = 0; static s16 sIconEnvG = 0;
static s16 sIconEnvB = 0; static s16 sIconEnvB = 0;
if (CVar_GetS32("gN64Colors", 0) != 0) { if (CVar_GetS32("gHudColors", 1) == 0) {
sIconPrimColors[0][0] = 4; sIconPrimColors[0][0] = 4;
sIconPrimColors[0][1] = 84; sIconPrimColors[0][1] = 84;
sIconPrimColors[0][2] = 204; sIconPrimColors[0][2] = 204;
@ -520,7 +520,7 @@ void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
sIconEnvColors[1][0] = 0; sIconEnvColors[1][0] = 0;
sIconEnvColors[1][1] = 70; sIconEnvColors[1][1] = 70;
sIconEnvColors[1][2] = 255; sIconEnvColors[1][2] = 255;
} else if (CVar_GetS32("gGameCubeColors", 0) != 0) {//Required else it do not refresh } else if (CVar_GetS32("gHudColors", 1) == 1) {//Probably could emptied I need some testing there, I will do it later.
sIconPrimColors[0][0] = 4; sIconPrimColors[0][0] = 4;
sIconPrimColors[0][1] = 200; sIconPrimColors[0][1] = 200;
sIconPrimColors[0][2] = 80; sIconPrimColors[0][2] = 80;
@ -533,13 +533,13 @@ void Message_DrawTextboxIcon(GlobalContext* globalCtx, Gfx** p, s16 x, s16 y) {
sIconEnvColors[1][0] = 0; sIconEnvColors[1][0] = 0;
sIconEnvColors[1][1] = 255; sIconEnvColors[1][1] = 255;
sIconEnvColors[1][2] = 130; sIconEnvColors[1][2] = 130;
} else if (CVar_GetS32("gCustomColors", 0) != 0) { } else if (CVar_GetS32("gHudColors", 1) == 2) {
sIconPrimColors[0][0] = CVar_GetInt("gCCABtnPrimR", 4)/2; sIconPrimColors[0][0] = (CVar_GetS32("gCCABtnPrimR", 4)/255)*80;
sIconPrimColors[0][1] = CVar_GetInt("gCCABtnPrimG", 200)/2; sIconPrimColors[0][1] = (CVar_GetS32("gCCABtnPrimG", 200)/255)*80;
sIconPrimColors[0][2] = CVar_GetInt("gCCABtnPrimB", 80)/2; sIconPrimColors[0][2] = (CVar_GetS32("gCCABtnPrimB", 80)/255)*80;
sIconPrimColors[1][0] = CVar_GetInt("gCCABtnPrimR", 50); sIconPrimColors[1][0] = CVar_GetS32("gCCABtnPrimR", 50);
sIconPrimColors[1][1] = CVar_GetInt("gCCABtnPrimG", 255); sIconPrimColors[1][1] = CVar_GetS32("gCCABtnPrimG", 255);
sIconPrimColors[1][2] = CVar_GetInt("gCCABtnPrimB", 130); sIconPrimColors[1][2] = CVar_GetS32("gCCABtnPrimB", 130);
sIconEnvColors[0][0] = 0; sIconEnvColors[0][0] = 0;
sIconEnvColors[0][1] = 0; sIconEnvColors[0][1] = 0;
sIconEnvColors[0][2] = 0; sIconEnvColors[0][2] = 0;
@ -2945,26 +2945,26 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A) { if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A) {
if (CVar_GetS32("gN64Colors", 0) != 0) { //A buttons :) if (CVar_GetS32("gHudColors", 1) == 0) { //A buttons :)
gDPSetPrimColor(gfx++, 0, 0, 80, 150, 255, sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, 80, 150, 255, sOcarinaNotesAlphaValues[i]);
gDPSetEnvColor(gfx++, 100, 200, 255, 0); gDPSetEnvColor(gfx++, 100, 200, 255, 0);
} else if (CVar_GetS32("gGameCubeColors", 0) != 0) { } else if (CVar_GetS32("gHudColors", 1) == 1) {
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteAPrimR, sOcarinaNoteAPrimG, sOcarinaNoteAPrimB, sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteAPrimR, sOcarinaNoteAPrimG, sOcarinaNoteAPrimB, sOcarinaNotesAlphaValues[i]);
gDPSetEnvColor(gfx++, sOcarinaNoteAEnvR, sOcarinaNoteAEnvG, sOcarinaNoteAEnvB, 0); gDPSetEnvColor(gfx++, sOcarinaNoteAEnvR, sOcarinaNoteAEnvG, sOcarinaNoteAEnvB, 0);
} else if (CVar_GetS32("gCustomColors", 0) != 0) { } else if (CVar_GetS32("gHudColors", 1) == 2) {
gDPSetPrimColor(gfx++, 0, 0, CVar_GetInt("gCCABtnPrimR", 0), CVar_GetInt("gCCABtnPrimG", 0), CVar_GetInt("gCCABtnPrimB", 0), sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, CVar_GetS32("gCCABtnPrimR", 0), CVar_GetS32("gCCABtnPrimG", 0), CVar_GetS32("gCCABtnPrimB", 0), sOcarinaNotesAlphaValues[i]);
gDPSetEnvColor(gfx++, CVar_GetInt("gCCABtnPrimR", 0)/2, CVar_GetInt("gCCABtnPrimG", 0)/2, CVar_GetInt("gCCABtnPrimB", 0)/2, 0); gDPSetEnvColor(gfx++, CVar_GetS32("gCCABtnPrimR", 0)/2, CVar_GetS32("gCCABtnPrimG", 0)/2, CVar_GetS32("gCCABtnPrimB", 0)/2, 0);
} }
} else { } else {
if (CVar_GetS32("gN64Colors", 0) != 0) { //C buttons :) if (CVar_GetS32("gHudColors", 1) == 0) { //C buttons :)
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, sOcarinaNotesAlphaValues[i]);
gDPSetEnvColor(gfx++, sOcarinaNoteCEnvR, sOcarinaNoteCEnvG, sOcarinaNoteCEnvB, 0); gDPSetEnvColor(gfx++, sOcarinaNoteCEnvR, sOcarinaNoteCEnvG, sOcarinaNoteCEnvB, 0);
} else if (CVar_GetS32("gGameCubeColors", 0) != 0) { } else if (CVar_GetS32("gHudColors", 1) == 1) {
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, sOcarinaNotesAlphaValues[i]);
gDPSetEnvColor(gfx++, sOcarinaNoteCEnvR, sOcarinaNoteCEnvG, sOcarinaNoteCEnvB, 0); gDPSetEnvColor(gfx++, sOcarinaNoteCEnvR, sOcarinaNoteCEnvG, sOcarinaNoteCEnvB, 0);
} else if (CVar_GetS32("gCustomColors", 0) != 0) { } else if (CVar_GetS32("gHudColors", 1) == 2) {
gDPSetPrimColor(gfx++, 0, 0, CVar_GetInt("gCCCBtnPrimR", 0), CVar_GetInt("gCCCBtnPrimG", 0), CVar_GetInt("gCCCBtnPrimB", 0), sOcarinaNotesAlphaValues[i]); gDPSetPrimColor(gfx++, 0, 0, CVar_GetS32("gCCCBtnPrimR", 0), CVar_GetS32("gCCCBtnPrimG", 0), CVar_GetS32("gCCCBtnPrimB", 0), sOcarinaNotesAlphaValues[i]);
gDPSetEnvColor(gfx++, CVar_GetInt("gCCCBtnPrimR", 0)/2, CVar_GetInt("gCCCBtnPrimG", 0)/2, CVar_GetInt("gCCCBtnPrimB", 0)/2, 0); gDPSetEnvColor(gfx++, CVar_GetS32("gCCCBtnPrimR", 0)/2, CVar_GetS32("gCCCBtnPrimG", 0)/2, CVar_GetS32("gCCCBtnPrimB", 0)/2, 0);
} }
} }