From 61d833a0485648839d315616dfd0b509a58ad0b7 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Sun, 23 Nov 2025 12:15:31 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20colisi=C3=B3=20de=20TRANSPATENT=20amb=20?=
 =?UTF-8?q?macro=20de=20windows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .claude/settings.local.json       | 10 ++++++++++
 source/core/rendering/surface.cpp |  4 ++--
 source/project.h                  |  2 +-
 source/utils/color.cpp            |  2 +-
 source/utils/color.hpp            |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 .claude/settings.local.json

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 0000000..0becd5a
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(cat:*)",
+      "Bash(cmake --build:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}
diff --git a/source/core/rendering/surface.cpp b/source/core/rendering/surface.cpp
index 3ad4f04..a566672 100644
--- a/source/core/rendering/surface.cpp
+++ b/source/core/rendering/surface.cpp
@@ -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));
 
diff --git a/source/project.h b/source/project.h
index 00688ab..eb8caf3 100644
--- a/source/project.h
+++ b/source/project.h
@@ -5,5 +5,5 @@ constexpr const char* NAME = "pollo";
 constexpr const char* LONG_NAME = "Los pollos hermanos";
 constexpr const char* VERSION = "0.1";
 constexpr const char* COPYRIGHT = "@2025 JailDesigner";
-constexpr const char* GIT_HASH = "";
+constexpr const char* GIT_HASH = "d995680";
 }  // namespace Project
diff --git a/source/utils/color.cpp b/source/utils/color.cpp
index e70c844..af7614f 100644
--- a/source/utils/color.cpp
+++ b/source/utils/color.cpp
@@ -12,7 +12,7 @@ auto Color::fromString(const std::string& name) -> Uint8 {
     // Incluye nombres oficiales del CPC y aliases para compatibilidad
     static const std::unordered_map<std::string, Uint8> COLOR_MAP = {
         // Transparente
-        {"transparent", index(Cpc::TRANSPARENT)},
+        {"transparent", index(Cpc::CLEAR)},
 
         // Colores oficiales Amstrad CPC
         {"black", index(Cpc::BLACK)},
diff --git a/source/utils/color.hpp b/source/utils/color.hpp
index 28cbaed..3a8d5b8 100644
--- a/source/utils/color.hpp
+++ b/source/utils/color.hpp
@@ -28,7 +28,7 @@ class Color {
      */
     enum class Cpc : Uint8 {
         // Transparente (índice 0)
-        TRANSPARENT = 0,
+        CLEAR = 0,  // Nota: No usar "TRANSPARENT" - colisiona con macro de Windows
 
         // Negros y azules (R=0)
         BLACK = 1,         // 0, 0, 0