From 74ae7a72c54af5fc5fb47f064c8c36df905ed964 Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Mon, 2 Aug 2021 12:06:10 -0700 Subject: [PATCH 1/2] Adjust Snake Nest colors so drawMonster can add them without overflowing to black --- graph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graph.cpp b/graph.cpp index 14375ee1..b45bb1b9 100644 --- a/graph.cpp +++ b/graph.cpp @@ -3362,7 +3362,7 @@ ld wavefun(ld x) { else return 0; */ } -EX colortable nestcolors = { 0x800000, 0x008000, 0x000080, 0x404040, 0x700070, 0x007070, 0x707000, 0x606060 }; +EX colortable nestcolors = { 0x7F0000, 0x007F00, 0x00007F, 0x404040, 0x700070, 0x007070, 0x707000, 0x606060 }; color_t floorcolors[landtypes]; From 07035f3c098f48eb1e6ec3072eb4db4bbaa4d489 Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Mon, 2 Aug 2021 19:40:05 -0700 Subject: [PATCH 2/2] Fix raised colors in Snake Nest --- graph.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graph.cpp b/graph.cpp index b45bb1b9..e4bf1995 100644 --- a/graph.cpp +++ b/graph.cpp @@ -3362,7 +3362,9 @@ ld wavefun(ld x) { else return 0; */ } -EX colortable nestcolors = { 0x7F0000, 0x007F00, 0x00007F, 0x404040, 0x700070, 0x007070, 0x707000, 0x606060 }; +// Color components in nestcolors must be less than 0x80 (for addition in drawMonster for Rock Snakes) +// and must be divisible by 4 (for brightening of raised cells in celldrawer::setcolors) +EX colortable nestcolors = { 0x7C0000, 0x007C00, 0x00007C, 0x404040, 0x700070, 0x007070, 0x707000, 0x606060 }; color_t floorcolors[landtypes];