This commit is contained in:
tobid7 2022-04-10 01:13:16 +02:00
parent 303e4105cb
commit 0cfd1a0e42
2 changed files with 7 additions and 7 deletions

View File

@ -892,7 +892,7 @@ RenderD7::Console::Console(int x, int y, int w, int h, u8 a)
this->color = {0, 0, 0, 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->x = x;
this->y = y; 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->h = h;
this->color = col; 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->x = x;
this->y = y; this->y = y;

View File

@ -287,8 +287,8 @@ namespace RenderD7
public: public:
Console(); Console();
Console(int x, int y, int w, int h, int a = 255); 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, RenderD7::Color::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, 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); void On(C3D_RenderTarget *t_cscreen);
bool Update(); bool Update();
~Console(); ~Console();
@ -299,9 +299,9 @@ namespace RenderD7
C3D_RenderTarget *cscreen; C3D_RenderTarget *cscreen;
bool m_nconsole = false; bool m_nconsole = false;
bool m_mconsole = false; bool m_mconsole = false;
RenderD7::rgba color = {255, 255, 255, 255}; RenderD7::Color::rgba color = {255, 255, 255, 255};
RenderD7::rgba outlinecol = {222, 222, 222, 255}; RenderD7::Color::rgba outlinecol = {222, 222, 222, 255};
RenderD7::rgba barcolor = {0, 0, 0, 255}; RenderD7::Color::rgba barcolor = {0, 0, 0, 255};
}; };
bool NameIsEndingWith(const std::string &name, const std::vector<std::string> &extensions); bool NameIsEndingWith(const std::string &name, const std::vector<std::string> &extensions);