Pause overworld map state while other menus are opened.
This commit is contained in:
parent
4463fbbae5
commit
3d6517e02f
@ -73,6 +73,8 @@ void State_OverworldMap::OnStateChange(GameState*prevState){
|
|||||||
Menu::OpenMenu(OVERWORLD_LEVEL_SELECT,false);
|
Menu::OpenMenu(OVERWORLD_LEVEL_SELECT,false);
|
||||||
};
|
};
|
||||||
void State_OverworldMap::OnUserUpdate(Crawler*game){
|
void State_OverworldMap::OnUserUpdate(Crawler*game){
|
||||||
|
if(Menu::stack.size()>1)return;
|
||||||
|
|
||||||
game->camera.SetTarget(currentConnectionPoint->rect.middle()+vf2d{game->GetScreenSize().x/6.0f,0});
|
game->camera.SetTarget(currentConnectionPoint->rect.middle()+vf2d{game->GetScreenSize().x/6.0f,0});
|
||||||
game->UpdateCamera(game->GetElapsedTime());
|
game->UpdateCamera(game->GetElapsedTime());
|
||||||
game->GetPlayer()->Update(game->GetElapsedTime());
|
game->GetPlayer()->Update(game->GetElapsedTime());
|
||||||
@ -85,7 +87,7 @@ void State_OverworldMap::OnUserUpdate(Crawler*game){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Crawler::KEY_MENU.Pressed()){
|
if(Menu::stack.size()==1&&Crawler::KEY_MENU.Pressed()){
|
||||||
Menu::OpenMenu(OVERWORLD_MENU);
|
Menu::OpenMenu(OVERWORLD_MENU);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ All rights reserved.
|
|||||||
#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 3326
|
#define VERSION_BUILD 3330
|
||||||
|
|
||||||
#define stringify(a) stringify_(a)
|
#define stringify(a) stringify_(a)
|
||||||
#define stringify_(a) #a
|
#define stringify_(a) #a
|
||||||
|
Loading…
x
Reference in New Issue
Block a user