sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Made a less stupid String to Class conversion function.

Browse Source
This commit is contained in:
sigonasr2 2023-10-24 04:58:51 -05:00
parent cedb465c79
commit c23c96b6b1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Crawler/ClassInfo.h
View File

@ -19,6 +19,12 @@ struct ClassInfo{
class classutils{ class classutils{
public: public:
static inline Class StringToClass(std::string className){
std::vector<std::string>classList=DATA["class_list"].GetValues();
auto it=std::find(classList.begin(),classList.end(),className);
int element=std::distance(classList.begin(),it);
return Class(1<<element);
};
static inline ClassInfo GetClassInfo(std::string className){ static inline ClassInfo GetClassInfo(std::string className){
ClassInfo data{ ClassInfo data{
DATA.GetProperty(className+".ClassName").GetString(), DATA.GetProperty(className+".ClassName").GetString(),

8
Crawler/ClassSelectionWindow.cpp
View File

@ -5,6 +5,7 @@
#include "MenuLabel.h" #include "MenuLabel.h"
#include "MenuAnimatedIconToggleButton.h" #include "MenuAnimatedIconToggleButton.h"
#include "GameState.h" #include "GameState.h"
#include "ClassInfo.h"
INCLUDE_game INCLUDE_game
typedef Attribute A; typedef Attribute A;
@ -29,12 +30,7 @@ void Menu::InitializeClassSelectionWindow(){
classSelectionWindow->AddComponent("Back Button",backButton); classSelectionWindow->AddComponent("Back Button",backButton);
MenuComponent*confirmButton=new MenuComponent(CLASS_SELECTION,{{outlineSize.x+4-navigationButtonSize.x-2,outlineSize.y+4-navigationButtonSize.y-2},navigationButtonSize},"Confirm",[](MenuFuncData data){ MenuComponent*confirmButton=new MenuComponent(CLASS_SELECTION,{{outlineSize.x+4-navigationButtonSize.x-2,outlineSize.y+4-navigationButtonSize.y-2},navigationButtonSize},"Confirm",[](MenuFuncData data){
std::string selectedClass=data.component->S(A::CLASS_SELECTION); std::string selectedClass=data.component->S(A::CLASS_SELECTION);
INCLUDE_DATA data.game->ChangePlayerClass(classutils::StringToClass(selectedClass));
std::vector<std::string>classList=DATA["class_list"].GetValues();
auto it=std::find(classList.begin(),classList.end(),selectedClass);
int element=std::distance(classList.begin(),it);
Class cl=Class(1<<element);
data.game->ChangePlayerClass(cl);
GameState::ChangeState(States::GAME_RUN); GameState::ChangeState(States::GAME_RUN);
}); });
confirmButton->disabled=true; confirmButton->disabled=true;

2
Crawler/Version.h
View File

@ -2,7 +2,7 @@
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 2404 #define VERSION_BUILD 2405
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a