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

Minimap can only be toggled when it's actually visible (e.g. not during boss fights)

Browse Source
This commit is contained in:
sigonasr2 2024-04-13 11:45:16 -05:00
parent 5446da7ef8
commit ef7fc2c826
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Adventures in Lestoria/Minimap.cpp
View File

@ -162,7 +162,7 @@ void Minimap::Reset(){
} }
void Minimap::Update(){ void Minimap::Update(){
if(game->KEY_TOGGLE_MAP.Pressed()){ if(game->KEY_TOGGLE_MAP.Pressed()&&MinimapVisible()){
if(displayMode==MinimapMode::SMALL)displayMode=MinimapMode::LARGE; if(displayMode==MinimapMode::SMALL)displayMode=MinimapMode::LARGE;
else if(displayMode==MinimapMode::LARGE)displayMode=MinimapMode::OFF; else if(displayMode==MinimapMode::LARGE)displayMode=MinimapMode::OFF;
else if(displayMode==MinimapMode::OFF)displayMode=MinimapMode::SMALL; else if(displayMode==MinimapMode::OFF)displayMode=MinimapMode::SMALL;
@ -212,7 +212,7 @@ void Minimap::UpdateChunk(const MapName map,const vi2d chunkPos){
void Minimap::Draw(){ void Minimap::Draw(){
const vf2d minimapPos=vf2d{float("Minimap.Minimap HUD Size"_I),float("Minimap.Minimap HUD Size"_I)}/2; const vf2d minimapPos=vf2d{float("Minimap.Minimap HUD Size"_I),float("Minimap.Minimap HUD Size"_I)}/2;
if(!game->InBossEncounter()){ if(MinimapVisible()){
switch(displayMode){ switch(displayMode){
case MinimapMode::SMALL:{ case MinimapMode::SMALL:{
mapCircleHud.DrawRotatedDecal(minimapPos,cover.Decal(),0.f,game->camera.GetPosition()/game->GetCurrentMapData().tilewidth,vf2d{0.5f,0.5f}); mapCircleHud.DrawRotatedDecal(minimapPos,cover.Decal(),0.f,game->camera.GetPosition()/game->GetCurrentMapData().tilewidth,vf2d{0.5f,0.5f});
@ -241,4 +241,8 @@ const MinimapMode&Minimap::GetMinimapMode()const{
void Minimap::SetMinimapMode(MinimapMode newMode){ void Minimap::SetMinimapMode(MinimapMode newMode){
displayMode=newMode; displayMode=newMode;
}
bool Minimap::MinimapVisible(){
return !game->InBossEncounter();
} }

2
Adventures in Lestoria/Minimap.h
View File

@ -67,4 +67,6 @@ private:
Renderable coverOutline; Renderable coverOutline;
std::unordered_map<MapName,std::unordered_set<std::string>>loadedChunks; std::unordered_map<MapName,std::unordered_set<std::string>>loadedChunks;
MinimapMode displayMode=MinimapMode::SMALL; MinimapMode displayMode=MinimapMode::SMALL;
bool MinimapVisible();
}; };