JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

Las clases text y menu ya acceden a resource

Browse Source
This commit is contained in:
Sergio
2022-10-27 12:43:28 +02:00
parent 4133dfd7c9
commit 9d9d9d92f2
13 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/common/menu.cpp
View File

@@ -2,7 +2,7 @@
#include "menu.h"
// Constructor
Menu::Menu(SDL_Renderer *renderer, Asset *asset, Input *input, std::string file)
Menu::Menu(SDL_Renderer *renderer, Resource *resource, Asset *asset, Input *input, std::string file)
{
// Copia punteros
this->renderer = renderer;
@@ -154,7 +154,7 @@ bool Menu::load(std::string file_path)
// Crea el objeto text tan pronto como se pueda. Necesario para añadir items
if (font_png != "" && font_txt != "" && !textAllocated)
{
text = new Text(asset->get(font_png), asset->get(font_txt), renderer);
text = new Text(font_png, asset->get(font_txt), resource, renderer);
textAllocated = true;
}
}
@@ -977,6 +977,6 @@ void Menu::setText(std::string font_png, std::string font_txt)
{
if (!text)
{
text = new Text(font_png, font_txt, renderer);
text = new Text(font_png, font_txt, resource, renderer);
}
}