Menudo puto lio de renamar coses, a vore si tot va quedant al lloc que els structs i els enums estan revolant i duplicats per tots llocs
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
#include "options.h" // for options
|
||||
#include "on_screen_help.h"
|
||||
#include "screen.h" // for Screen
|
||||
#include "section.h" // for options_e, name, name_e, options
|
||||
#include "section.h" // for SectionOptions, name, SectionName, options
|
||||
#include "utils.h" // for OptionsAudio, Options, OptionsMusic, boolToOnOff
|
||||
|
||||
namespace globalInputs
|
||||
@@ -26,11 +26,11 @@ namespace globalInputs
|
||||
}
|
||||
|
||||
// Termina
|
||||
void quit(section::options_e code)
|
||||
void quit(section::Options code)
|
||||
{
|
||||
if (Screen::get()->notificationsAreActive())
|
||||
{
|
||||
section::name = section::NAME_QUIT;
|
||||
section::name = section::Name::QUIT;
|
||||
section::options = code;
|
||||
}
|
||||
else
|
||||
@@ -42,7 +42,7 @@ namespace globalInputs
|
||||
// Reinicia
|
||||
void reset()
|
||||
{
|
||||
section::name = section::NAME_INIT;
|
||||
section::name = section::Name::INIT;
|
||||
Screen::get()->showNotification("Reset");
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace globalInputs
|
||||
// Comprueba si se sale con el teclado
|
||||
if (Input::get()->checkInput(input_exit, INPUT_DO_NOT_ALLOW_REPEAT, INPUT_USE_KEYBOARD))
|
||||
{
|
||||
quit(section::OPTIONS_QUIT_NORMAL);
|
||||
quit(section::Options::QUIT_NORMAL);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ namespace globalInputs
|
||||
// Comprueba si se sale con el mando
|
||||
if (Input::get()->checkModInput(input_service, input_exit, INPUT_DO_NOT_ALLOW_REPEAT, INPUT_USE_GAMECONTROLLER, i))
|
||||
{
|
||||
quit(section::OPTIONS_QUIT_SHUTDOWN);
|
||||
quit(section::Options::QUIT_SHUTDOWN);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user