From 0cfd1a0e4255bb127ab1438f85a93e79917ba611 Mon Sep 17 00:00:00 2001 From: Tobi-D7 Date: Sun, 10 Apr 2022 01:13:16 +0200 Subject: [PATCH] OK --- renderd7.cpp | 4 ++-- renderd7.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/renderd7.cpp b/renderd7.cpp index ba00fcf..331577a 100644 --- a/renderd7.cpp +++ b/renderd7.cpp @@ -892,7 +892,7 @@ RenderD7::Console::Console(int x, int y, int w, int h, u8 a) this->color = {0, 0, 0, a}; } -RenderD7::Console::Console(int x, int y, int w, int h, RenderD7::rgba col) +RenderD7::Console::Console(int x, int y, int w, int h, RenderD7::Color::rgba col) { this->x = x; this->y = y; @@ -900,7 +900,7 @@ RenderD7::Console::Console(int x, int y, int w, int h, RenderD7::rgba col) this->h = h; this->color = col; } -RenderD7::Console::Console(int x, int y, int w, int h, std::string name, RenderD7::rgba col, RenderD7::rgba barcol, RenderD7::rgba outlinecol) +RenderD7::Console::Console(int x, int y, int w, int h, std::string name, RenderD7::Color::rgba col, RenderD7::Color::rgba barcol, RenderD7::Color::rgba outlinecol) { this->x = x; this->y = y; diff --git a/renderd7.hpp b/renderd7.hpp index a3d3831..757af84 100644 --- a/renderd7.hpp +++ b/renderd7.hpp @@ -287,8 +287,8 @@ namespace RenderD7 public: Console(); Console(int x, int y, int w, int h, int a = 255); - Console(int x, int y, int w, int h, RenderD7::rgba col); - Console(int x, int y, int w, int h, std::string name, RenderD7::rgba col = {255, 255, 255, 255}, RenderD7::rgba barcol = {0, 0, 0, 255}, RenderD7::rgba outlinecol = {222, 222, 222, 255}); + Console(int x, int y, int w, int h, RenderD7::Color::rgba col); + Console(int x, int y, int w, int h, std::string name, RenderD7::Color::rgba col = {255, 255, 255, 255}, RenderD7::Color::rgba barcol = {0, 0, 0, 255}, RenderD7::Color::rgba outlinecol = {222, 222, 222, 255}); void On(C3D_RenderTarget *t_cscreen); bool Update(); ~Console(); @@ -299,9 +299,9 @@ namespace RenderD7 C3D_RenderTarget *cscreen; bool m_nconsole = false; bool m_mconsole = false; - RenderD7::rgba color = {255, 255, 255, 255}; - RenderD7::rgba outlinecol = {222, 222, 222, 255}; - RenderD7::rgba barcolor = {0, 0, 0, 255}; + RenderD7::Color::rgba color = {255, 255, 255, 255}; + RenderD7::Color::rgba outlinecol = {222, 222, 222, 255}; + RenderD7::Color::rgba barcolor = {0, 0, 0, 255}; }; bool NameIsEndingWith(const std::string &name, const std::vector &extensions);