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

Switch to templates for grabbing a component from a menu.

Browse Source
pull/28/head
sigonasr2 1 year ago
parent 347f4cc576
commit 795d59f1a4
5 changed files with 14 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      Crawler/Menu.h
  2. 14
      Crawler/State_OverworldMap.cpp
  3. 2
      Crawler/Version.h
  4. 2
      Crawler/assets/Campaigns/1_2.tmx
  5. BIN
      x64/Release/Crawler.exe

7
Crawler/Menu.h
Unescape View File

@ -9,8 +9,6 @@
class Crawler; class Crawler;
class MenuComponent; class MenuComponent;
#define COMPONENT(type,menu,componentName) ((type*)Menu::menus[menu]->components.at(componentName))
enum MenuType{ enum MenuType{
TEST, TEST,
TEST_2, TEST_2,
@ -24,6 +22,11 @@ enum MenuType{
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
}; };
template<typename T>
T*Component(MenuType menu,std::string componentName){
return (T*)Menu::menus[menu]->components[componentName];
}
class Menu:IAttributable{ class Menu:IAttributable{
friend class Crawler; friend class Crawler;
friend class Player; friend class Player;

14
Crawler/State_OverworldMap.cpp
Unescape View File

@ -27,10 +27,10 @@ void State_OverworldMap::OnStateChange(GameState*prevState){
game->GetPlayer()->SetState(State::FORCE_WALK); game->GetPlayer()->SetState(State::FORCE_WALK);
game->GetPlayer()->SetSizeMult(1); game->GetPlayer()->SetSizeMult(1);
game->camera.MoveCamera(currentConnectionPoint->rect.middle()+vf2d{game->GetScreenSize().x/6.0f,0}); game->camera.MoveCamera(currentConnectionPoint->rect.middle()+vf2d{game->GetScreenSize().x/6.0f,0});
COMPONENT(MenuLabel,OVERWORLD_LEVEL_SELECT,"Chapter Label")->SetLabel("Chapter "+std::to_string(game->GetCurrentChapter())); Component<MenuLabel>(OVERWORLD_LEVEL_SELECT,"Chapter Label")->SetLabel("Chapter "+std::to_string(game->GetCurrentChapter()));
COMPONENT(MenuLabel,OVERWORLD_LEVEL_SELECT,"Stage Label")->SetLabel(currentConnectionPoint->name); Component<MenuLabel>(OVERWORLD_LEVEL_SELECT,"Stage Label")->SetLabel(currentConnectionPoint->name);
COMPONENT(EncountersSpawnListScrollableWindowComponent,OVERWORLD_LEVEL_SELECT,"Spawns List")->UpdateSpawns(currentConnectionPoint->spawns); Component<EncountersSpawnListScrollableWindowComponent>(OVERWORLD_LEVEL_SELECT,"Spawns List")->UpdateSpawns(currentConnectionPoint->spawns);
COMPONENT(MenuComponent,OVERWORLD_LEVEL_SELECT,"Enter Button")->Enable(currentConnectionPoint->levelDataExists); Component<MenuComponent>(OVERWORLD_LEVEL_SELECT,"Enter Button")->Enable(currentConnectionPoint->levelDataExists);
Menu::OpenMenu(OVERWORLD_LEVEL_SELECT,false); Menu::OpenMenu(OVERWORLD_LEVEL_SELECT,false);
}; };
void State_OverworldMap::OnUserUpdate(Crawler*game){ void State_OverworldMap::OnUserUpdate(Crawler*game){
@ -66,9 +66,9 @@ void State_OverworldMap::OnUserUpdate(Crawler*game){
}else{ }else{
game->GetPlayer()->UpdateWalkingAnimation(LEFT); game->GetPlayer()->UpdateWalkingAnimation(LEFT);
} }
COMPONENT(MenuLabel,OVERWORLD_LEVEL_SELECT,"Stage Label")->SetLabel(currentConnectionPoint->name); Component<MenuLabel>(OVERWORLD_LEVEL_SELECT,"Stage Label")->SetLabel(currentConnectionPoint->name);
COMPONENT(EncountersSpawnListScrollableWindowComponent,OVERWORLD_LEVEL_SELECT,"Spawns List")->UpdateSpawns(currentConnectionPoint->spawns); Component<EncountersSpawnListScrollableWindowComponent>(OVERWORLD_LEVEL_SELECT,"Spawns List")->UpdateSpawns(currentConnectionPoint->spawns);
COMPONENT(MenuComponent,OVERWORLD_LEVEL_SELECT,"Enter Button")->Enable(currentConnectionPoint->levelDataExists); Component<MenuComponent>(OVERWORLD_LEVEL_SELECT,"Enter Button")->Enable(currentConnectionPoint->levelDataExists);
break; break;
} }
} }

2
Crawler/Version.h
Unescape 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 1 #define VERSION_PATCH 1
#define VERSION_BUILD 2790 #define VERSION_BUILD 2794
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

2
Crawler/assets/Campaigns/1_2.tmx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="174" height="144" tilewidth="24" tileheight="24" infinite="0" nextlayerid="6" nextobjectid="5"> <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="174" height="144" tilewidth="24" tileheight="24" infinite="0" nextlayerid="6" nextobjectid="7">
<tileset firstgid="1" source="../maps/grass_tiles_24x24.tsx"/> <tileset firstgid="1" source="../maps/grass_tiles_24x24.tsx"/>
<tileset firstgid="784" source="../maps/grass_tiles_modded.tsx"/> <tileset firstgid="784" source="../maps/grass_tiles_modded.tsx"/>
<tileset firstgid="1567" source="../maps/Tilesheet_No_Shadow24x24.tsx"/> <tileset firstgid="1567" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>

BIN
x64/Release/Crawler.exe
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save