|
|
@ -239,13 +239,13 @@ void Menu::Draw(Crawler*game){ |
|
|
|
game->Clear(BLANK); |
|
|
|
game->Clear(BLANK); |
|
|
|
for(auto&component:displayComponents){ |
|
|
|
for(auto&component:displayComponents){ |
|
|
|
if(component->renderInMain){ |
|
|
|
if(component->renderInMain){ |
|
|
|
component->_Draw(game,pos,this==Menu::stack.back()); |
|
|
|
component->_Draw(game,{0,0},this==Menu::stack.back()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
for(auto&key:buttons){ |
|
|
|
for(auto&key:buttons){ |
|
|
|
for(auto&button:key.second){ |
|
|
|
for(auto&button:key.second){ |
|
|
|
if(button->renderInMain){ |
|
|
|
if(button->renderInMain){ |
|
|
|
button->_Draw(game,pos,this==Menu::stack.back()); |
|
|
|
button->_Draw(game,{0,0},this==Menu::stack.back()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -255,13 +255,13 @@ void Menu::Draw(Crawler*game){ |
|
|
|
game->DrawDecal(pos,r.Decal()); |
|
|
|
game->DrawDecal(pos,r.Decal()); |
|
|
|
for(auto&component:displayComponents){ |
|
|
|
for(auto&component:displayComponents){ |
|
|
|
if(component->renderInMain){ |
|
|
|
if(component->renderInMain){ |
|
|
|
component->_DrawDecal(game,pos,this==Menu::stack.back()); |
|
|
|
component->_DrawDecal(game,{0,0},this==Menu::stack.back()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
for(auto&key:buttons){ |
|
|
|
for(auto&key:buttons){ |
|
|
|
for(auto&button:key.second){ |
|
|
|
for(auto&button:key.second){ |
|
|
|
if(button->renderInMain){ |
|
|
|
if(button->renderInMain){ |
|
|
|
button->_DrawDecal(game,pos,this==Menu::stack.back()); |
|
|
|
button->_DrawDecal(game,{0,0},this==Menu::stack.back()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -588,5 +588,5 @@ void Menu::AddInventoryListener(MenuComponent*component,ITCategory category){ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
vf2d Menu::center(){ |
|
|
|
vf2d Menu::center(){ |
|
|
|
return pos+size/2; |
|
|
|
return size/2; |
|
|
|
} |
|
|
|
} |