From ef7fc2c826df00285a957d39869ae601528261cf Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sat, 13 Apr 2024 11:45:16 -0500
Subject: [PATCH] Minimap can only be toggled when it's actually visible (e.g.
 not during boss fights)

---
 Adventures in Lestoria/Minimap.cpp | 8 ++++++--
 Adventures in Lestoria/Minimap.h   | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Adventures in Lestoria/Minimap.cpp b/Adventures in Lestoria/Minimap.cpp
index 4ef7ae8b..d7282f1c 100644
--- a/Adventures in Lestoria/Minimap.cpp	
+++ b/Adventures in Lestoria/Minimap.cpp	
@@ -162,7 +162,7 @@ void Minimap::Reset(){
 }
 
 void Minimap::Update(){
-	if(game->KEY_TOGGLE_MAP.Pressed()){
+	if(game->KEY_TOGGLE_MAP.Pressed()&&MinimapVisible()){
 		if(displayMode==MinimapMode::SMALL)displayMode=MinimapMode::LARGE;
 		else if(displayMode==MinimapMode::LARGE)displayMode=MinimapMode::OFF;
 		else if(displayMode==MinimapMode::OFF)displayMode=MinimapMode::SMALL;
@@ -212,7 +212,7 @@ void Minimap::UpdateChunk(const MapName map,const vi2d chunkPos){
 
 void Minimap::Draw(){
 	const vf2d minimapPos=vf2d{float("Minimap.Minimap HUD Size"_I),float("Minimap.Minimap HUD Size"_I)}/2;
-	if(!game->InBossEncounter()){
+	if(MinimapVisible()){
 		switch(displayMode){
 			case MinimapMode::SMALL:{
 				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){
 	displayMode=newMode;
+}
+
+bool Minimap::MinimapVisible(){
+	return !game->InBossEncounter();
 }
\ No newline at end of file
diff --git a/Adventures in Lestoria/Minimap.h b/Adventures in Lestoria/Minimap.h
index a8fbc390..840ade9a 100644
--- a/Adventures in Lestoria/Minimap.h	
+++ b/Adventures in Lestoria/Minimap.h	
@@ -67,4 +67,6 @@ private:
 	Renderable coverOutline;
 	std::unordered_map<MapName,std::unordered_set<std::string>>loadedChunks;
 	MinimapMode displayMode=MinimapMode::SMALL;
+
+	bool MinimapVisible();
 };
\ No newline at end of file