From 2f7381847a7f956552a42d0b319ff714b98ed269 Mon Sep 17 00:00:00 2001 From: y4my4my4m <8145020+y4my4my4m@users.noreply.github.com> Date: Wed, 31 May 2023 02:21:09 +0900 Subject: [PATCH] Fix --- src/Home/PaletteEditor/PaletteEdit.ZC | 5 ++--- src/Home/PaletteEditor/PaletteGod.ZC | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Home/PaletteEditor/PaletteEdit.ZC b/src/Home/PaletteEditor/PaletteEdit.ZC index f9045e9c..2772e7b2 100755 --- a/src/Home/PaletteEditor/PaletteEdit.ZC +++ b/src/Home/PaletteEditor/PaletteEdit.ZC @@ -171,7 +171,6 @@ U0 DrawCtrlSlider(CDC *dc, CCtrl *c) GrRect(dc, 6, (size2 * 2) + 65 + 16 * i, 80, 18); - if (i == selected_color) dc->color = 15; else @@ -421,7 +420,7 @@ public U0 PaletteEditor() if (selected_color == 15) selected_color = -1; SelectColor(selected_color + 1, c); - break; + break; } break; case CH_CTRLO: @@ -429,7 +428,7 @@ public U0 PaletteEditor() current_palette = PaletteSelect; break; case 'r': - gr_palette[selected_color] = ColorGod(FALSE, TRUE); + gr_palette[selected_color] = ColorGod(TRUE); LFBFlush; break; case 'R': diff --git a/src/Home/PaletteEditor/PaletteGod.ZC b/src/Home/PaletteEditor/PaletteGod.ZC index 329250f4..d8ad16d9 100755 --- a/src/Home/PaletteEditor/PaletteGod.ZC +++ b/src/Home/PaletteEditor/PaletteGod.ZC @@ -1,9 +1,7 @@ -CBGR24 ColorGod(Bool seedUse=TRUE, Bool instant=TRUE) +CBGR24 ColorGod(Bool instant=TRUE) { // Generate a random color, seed-based or not - if (seedUse) - Seed(GodPick); - if (instant || seedUse) + if (instant) return RandI32 & 0xFFFFFF; else return GodPick & 0xFFFFFF; @@ -13,8 +11,10 @@ public U0 PaletteGod(Bool seedUse=TRUE, Bool instant=TRUE) { // Generate a random palette, seed-based or not I64 i; + if (seedUse) + Seed(GodPick); for (i=0; i < 16; i++) - gr_palette[i] = ColorGod(seedUse, instant); + gr_palette[i] = ColorGod(instant); LFBFlush; }