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

TRANSPARENT->EMPTY makes it compile on Windows

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-08-06 15:43:02 -05:00
parent 2e33081b1b
commit 8ceb5d0ec4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/boe.town.cpp
View File

@@ -1543,13 +1543,13 @@ void draw_map(bool need_refresh, std::string tooltip_text) {
// Draw signs
const std::vector<sign_loc_t>& sign_locs = is_out() ? univ.out->sign_locs : univ.town->sign_locs;
for(sign_loc_t sign : sign_locs){
mark_loc(sign, Colours::TRANSPARENT, Colours::YELLOW);
mark_loc(sign, Colours::EMPTY, Colours::YELLOW);
}
// Draw town entrances
if(is_out()){
const std::vector<spec_loc_t>& city_locs = univ.out->city_locs;
for(spec_loc_t city : city_locs){
mark_loc(city, Colours::TRANSPARENT, Colours::GREEN);
mark_loc(city, Colours::EMPTY, Colours::GREEN);
}
}
// Draw vehicles

3
src/gfx/render_shapes.hpp
View File

@@ -58,7 +58,8 @@ namespace Colours {
const sf::Color YELLOW { 0xff, 0xff, 0x31};
const sf::Color ORANGE { 0xff, 0x80, 0x00};
const sf::Color LIGHT_BLUE { 0xad, 0xd8, 0xe6 }; // Spell points on dark background
const sf::Color TRANSPARENT { 0x00, 0x00, 0x00, 0x00 };
// On Windows, TRANSPARENT is macro-defined as something...?
const sf::Color EMPTY { 0x00, 0x00, 0x00, 0x00 };
// Text colours for shopping / talking
// TODO: The Windows version appears to use completely different colours?
const sf::Color SHADOW { 0x00, 0x00, 0x68}; // formerly c[3] QD colour = {0,0,26623} (shop/character name shadow, shop subtitle)