openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Tweak text colours to be less blindingly bright and closer to the original Mac BoE

Browse Source
This commit is contained in:
Celtic Minstrel
2020-02-01 19:53:23 -05:00
parent 5675ab8c71
commit 3e686cb908
10 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scenedit/scen.graphics.cpp
View File

@@ -465,7 +465,7 @@ void draw_lb_slot (short which,short mode) {
}
else text_rect.offset(0,2);
if(mode > 0)
style.colour = sf::Color::Blue;
style.colour = Colours::BLUE;
style.lineHeight = 12;
win_draw_string(mainPtr,text_rect,left_button_status[which].label,eTextMode::WRAP,style);
}
@@ -492,7 +492,7 @@ void draw_rb_slot (short which,short mode) {
TextStyle style;
if(mode > 0)
style.colour = sf::Color::Red;
style.colour = Colours::RED;
style.lineHeight = 12;
win_draw_string(mainPtr,text_rect,right_button_status[which].label,eTextMode::WRAP,style);
}
@@ -929,7 +929,7 @@ void draw_terrain(){
draw_rect.bottom = 24 + 36 * (town->area_desc[i].bottom - cen_y + 4);
draw_rect.inset(-10, -13);
draw_rect.offset(TER_RECT_UL_X,TER_RECT_UL_Y);
frame_rect(mainPtr, draw_rect, sf::Color::Red);
frame_rect(mainPtr, draw_rect, Colours::RED);
}
// draw border rect
draw_rect.left = 21 + 28 * (town->in_town_rect.left - cen_x + 4);
@@ -950,7 +950,7 @@ void draw_terrain(){
draw_rect.bottom = 24 + 36 * (current_terrain->area_desc[i].bottom - cen_y + 4);
draw_rect.inset(-10, -13);
draw_rect.offset(TER_RECT_UL_X, TER_RECT_UL_Y);
frame_rect(mainPtr, draw_rect, sf::Color::Red);
frame_rect(mainPtr, draw_rect, Colours::RED);
}
}
clip_rect(mainPtr, terrain_rect);
@@ -1258,12 +1258,12 @@ void draw_frames() {
if((which_pt.x == town->wandering_locs[i].x) &&
(which_pt.y == town->wandering_locs[i].y)) {
frame_rect(mainPtr, draw_rect, sf::Color::Red);
frame_rect(mainPtr, draw_rect, Colours::RED);
}
for(short i = 0; i < town->start_locs.size(); i++)
if((which_pt.x == town->start_locs[i].x) &&
(which_pt.y == town->start_locs[i].y)) {
frame_rect(mainPtr, draw_rect, sf::Color::Magenta);
frame_rect(mainPtr, draw_rect, Colours::PINK);
}

3
src/scenedit/scen.keydlgs.cpp
View File

@@ -20,6 +20,7 @@
#include "pictchoice.hpp"
#include "res_strings.hpp"
#include "spell.hpp"
#include "render_shapes.hpp" // for colour constants
extern short cen_x, cen_y;
extern bool mouse_button_held;
@@ -129,7 +130,7 @@ short choose_background(short cur_choice, cDialog* parent) {
auto set_colour_for = [&](int which) {
sf::Color to = sf::Color::Black;
if(which == 2)
to = sf::Color::Red;
to = Colours::RED;
else if(which == 3)
to = {0x00, 0x00, 0x80};
else if(which == 11)