boe.newgraph.cpp: try to improve the lighting,

pc.main.cpp,scen.main.cpp: do not change the mac icon
boe.actions.cpp: correct a recent problem with new escape keyevents
+ minors cleaning
This commit is contained in:
ALONSO Laurent
2021-10-10 13:47:54 +02:00
committed by Celtic Minstrel
parent 4885ead643
commit 17ba320d65
8 changed files with 17 additions and 21 deletions

View File

@@ -190,7 +190,7 @@ void adjust_windows (sf::RenderWindow & mainPtr, sf::View & mainView) {
// Apply view to the main window
mainPtr.setView(mainView);
#ifndef SFML_SYSTEM_MAC // This overrides Dock icon on OSX, which isn't what we want at all
#ifndef __APPLE__ // This overrides Dock icon on OSX, which isn't what we want at all
auto const & icon = *ResMgr::textures.get("icon", true);
mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr());
#endif