fix: colisió de TRANSPATENT amb macro de windows
This commit is contained in:
1 parent
d995680f71
commit
61d833a048
5 files changed
+15
-5
No files matched your search
@@ -93,10 +93,10 @@ auto readPalFile(const std::string& file_path) -> Palette {
|
||||
// Constructor
|
||||
Surface::Surface(int w, int h)
|
||||
: surface_data_(std::make_shared<SurfaceData>(w, h)),
|
||||
transparent_color_(Color::index(Color::Cpc::TRANSPARENT)) { initializeSubPalette(sub_palette_); }
|
||||
transparent_color_(Color::index(Color::Cpc::CLEAR)) { initializeSubPalette(sub_palette_); }
|
||||
|
||||
Surface::Surface(const std::string& file_path)
|
||||
: transparent_color_(Color::index(Color::Cpc::TRANSPARENT)) {
|
||||
: transparent_color_(Color::index(Color::Cpc::CLEAR)) {
|
||||
SurfaceData loaded_data = loadSurface(file_path);
|
||||
surface_data_ = std::make_shared<SurfaceData>(std::move(loaded_data));
|
||||
|
||||
|
||||
Reference in new issue
Block a user