From b0842087600c8e31c4f1dd38c0418d6ad855c8e0 Mon Sep 17 00:00:00 2001 From: Justin Scofield Date: Sat, 23 Jul 2022 16:34:08 -0400 Subject: [PATCH] housekeeping snes types --- src/app/gfx/snes_palette.cc | 9 ++++----- src/app/gfx/snes_palette.h | 1 - src/app/gfx/snes_tile.cc | 1 - src/app/gfx/snes_tile.h | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/app/gfx/snes_palette.cc b/src/app/gfx/snes_palette.cc index 12d29da5..4e168026 100644 --- a/src/app/gfx/snes_palette.cc +++ b/src/app/gfx/snes_palette.cc @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -60,7 +59,8 @@ SNESPalette::SNESPalette(char* data) : size_(sizeof(data) / 2) { } } -SNESPalette::SNESPalette(const unsigned char* snes_pal) : size_(sizeof(snes_pal) / 2) { +SNESPalette::SNESPalette(const unsigned char* snes_pal) + : size_(sizeof(snes_pal) / 2) { assert((sizeof(snes_pal) % 4 == 0) && (sizeof(snes_pal) <= 32)); for (unsigned i = 0; i < sizeof(snes_pal); i += 2) { SNESColor col; @@ -72,7 +72,7 @@ SNESPalette::SNESPalette(const unsigned char* snes_pal) : size_(sizeof(snes_pal) } } -SNESPalette::SNESPalette(const std::vector & cols) { +SNESPalette::SNESPalette(const std::vector& cols) { for (const auto& each : cols) { SNESColor scol; scol.setRgb(each); @@ -102,8 +102,7 @@ SDL_Palette* SNESPalette::GetSDL_Palette() { color[i].g = (uint8_t)colors[i].rgb.y * 100; color[i].b = (uint8_t)colors[i].rgb.z * 100; std::cout << "Color " << i << " added (R:" << color[i].r - << " G:" << color[i].g << " B:" << color[i].b << ")" - << std::endl; + << " G:" << color[i].g << " B:" << color[i].b << ")" << std::endl; } sdl_palette->colors = color.data(); diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h index 7689a988..e240e56b 100644 --- a/src/app/gfx/snes_palette.h +++ b/src/app/gfx/snes_palette.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/src/app/gfx/snes_tile.cc b/src/app/gfx/snes_tile.cc index 32a626d8..4910f1ae 100644 --- a/src/app/gfx/snes_tile.cc +++ b/src/app/gfx/snes_tile.cc @@ -4,7 +4,6 @@ #include #include "app/core/constants.h" -#include "app/gfx/snes_palette.h" namespace yaze { namespace app { diff --git a/src/app/gfx/snes_tile.h b/src/app/gfx/snes_tile.h index c2328d7e..e941aaac 100644 --- a/src/app/gfx/snes_tile.h +++ b/src/app/gfx/snes_tile.h @@ -5,7 +5,6 @@ #include #include "app/core/constants.h" -#include "app/gfx/snes_palette.h" namespace yaze { namespace app {