From 32f62cadb0b5eb6a64f329520429b59990d095c2 Mon Sep 17 00:00:00 2001
From: wgroeneveld <wouter.groeneveld@gmail.com>
Date: Mon, 6 Aug 2018 09:50:53 +0200
Subject: [PATCH] u16 = COLOR

---
 src/engine/palette/palette_manager.cpp |  5 ++++-
 src/engine/palette/palette_manager.h   | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/engine/palette/palette_manager.cpp b/src/engine/palette/palette_manager.cpp
index 8c3ab9e..259bf0d 100644
--- a/src/engine/palette/palette_manager.cpp
+++ b/src/engine/palette/palette_manager.cpp
@@ -14,6 +14,10 @@ int getBits(int number, int k, int p) {
     return (((1 << k) - 1) & (number >> p));
 }
 
+PaletteManager::PaletteManager(const COLOR *paletteData, int size) : data(paletteData), size(size) {
+
+}
+
 CombinedPalette* PaletteManager::operator+(const PaletteManager &other) {
     return new CombinedPalette(*this, const_cast<PaletteManager&>(other));
 }
@@ -59,7 +63,6 @@ void PaletteManager::increaseBrightness(u32 intensity) {
         return;
     }
 
-    auto palBank = this->paletteBank();
     for(int bank = 0; bank < PALETTE_BANK_SIZE; bank++) {
         for(int index = 0; index < PALETTE_BANK_SIZE; index++) {
             auto current = get(bank, index);
diff --git a/src/engine/palette/palette_manager.h b/src/engine/palette/palette_manager.h
index 6d5040d..a3249da 100644
--- a/src/engine/palette/palette_manager.h
+++ b/src/engine/palette/palette_manager.h
@@ -18,14 +18,14 @@ class CombinedPalette;
 
 class PaletteManager {
 protected:
-    const u16 *data;
+    const COLOR *data;
     int size;
 
     virtual void* paletteAddress() = 0;
     virtual PALBANK* paletteBank() = 0;
 public:
-    PaletteManager(const u16 paletteData[]) : data(paletteData), size(PALETTE_MAX_SIZE) {}
-    PaletteManager(const u16 paletteData[], int size) : data(paletteData), size(size) {}
+    PaletteManager(const COLOR paletteData[]) : PaletteManager(paletteData, PALETTE_MAX_SIZE) {}
+    PaletteManager(const COLOR paletteData[], int size);
 
     CombinedPalette* operator+(const PaletteManager& other);
 
@@ -54,8 +54,8 @@ protected:
 
 public:
     BackgroundPaletteManager() : PaletteManager(nullptr) {}
-    BackgroundPaletteManager(const u16 paletteData[]) : PaletteManager(paletteData) {}
-    BackgroundPaletteManager(const u16 paletteData[], int size) : PaletteManager(paletteData, size) {}
+    BackgroundPaletteManager(const COLOR paletteData[]) : PaletteManager(paletteData) {}
+    BackgroundPaletteManager(const COLOR paletteData[], int size) : PaletteManager(paletteData, size) {}
 };
 
 
@@ -70,8 +70,8 @@ protected:
     }
 
 public:
-    ForegroundPaletteManager(const u16 paletteData[]) : PaletteManager(paletteData) {}
-    ForegroundPaletteManager(const u16 paletteData[], int size) : PaletteManager(paletteData, size) {}
+    ForegroundPaletteManager(const COLOR paletteData[]) : PaletteManager(paletteData) {}
+    ForegroundPaletteManager(const COLOR paletteData[], int size) : PaletteManager(paletteData, size) {}
 };
 
 #endif //GBA_SPRITE_ENGINE_PALETTE_MANAGER_H