diff --git a/Adventures in Lestoria/SaveFile.cpp b/Adventures in Lestoria/SaveFile.cpp index 8111480e..f773aa45 100644 --- a/Adventures in Lestoria/SaveFile.cpp +++ b/Adventures in Lestoria/SaveFile.cpp @@ -312,7 +312,9 @@ void SaveFile::LoadFile(){ else opt_cp.value()->SetVisited(); } } - State_OverworldMap::SetStageMarker(loadFile["Overworld Map Location"].GetString()); + if(State_OverworldMap::HasStageMarker(loadFile["Overworld Map Location"].GetString())){ + State_OverworldMap::SetStageMarker(loadFile["Overworld Map Location"].GetString()); + } State_OverworldMap::UpdateCurrentConnectionPoint(const_cast(State_OverworldMap::GetCurrentConnectionPoint())); game->SetChapter(loadFile["Chapter"].GetInt()); SaveFile::SetSaveFileName(loadFile["Save Name"].GetString()); diff --git a/Adventures in Lestoria/State_OverworldMap.cpp b/Adventures in Lestoria/State_OverworldMap.cpp index d21beb94..7b4b64e8 100644 --- a/Adventures in Lestoria/State_OverworldMap.cpp +++ b/Adventures in Lestoria/State_OverworldMap.cpp @@ -212,6 +212,14 @@ void State_OverworldMap::Draw(AiL*game){ } }; void State_OverworldMap::DrawOverlay(AiL*game){} +bool State_OverworldMap::HasStageMarker(std::string connectionName){ + for(ConnectionPoint&connection:connections){ + if(connection.name==connectionName){ + return true; + } + } + return false; +} void State_OverworldMap::SetStageMarker(std::string connectionName){ for(ConnectionPoint&connection:connections){ if(connection.name==connectionName){ diff --git a/Adventures in Lestoria/State_OverworldMap.h b/Adventures in Lestoria/State_OverworldMap.h index 8f394a91..80b27016 100644 --- a/Adventures in Lestoria/State_OverworldMap.h +++ b/Adventures in Lestoria/State_OverworldMap.h @@ -52,6 +52,7 @@ public: State_OverworldMap(); static std::vectorconnections; static ConnectionPoint&GetCurrentConnectionPoint(); + static bool HasStageMarker(std::string connectionName); static void SetStageMarker(std::string connectionName); static ConnectionPoint&ConnectionPointFromIndex(int ind); static std::optionalConnectionPointFromString(std::string_view mapName); diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 073bb2a1..db18c964 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -20,5 +20,3 @@ Funny text colors with text color override on blacksmith menu Toggle for displaying error messages Level Up shows Health + and Atk + Indicators - -Ranger Backdash range buff? diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index da55bad0..719cf6b6 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 4 #define VERSION_PATCH 4 -#define VERSION_BUILD 7909 +#define VERSION_BUILD 7910 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/Monsters.txt b/Adventures in Lestoria/assets/config/Monsters.txt index ab6dd078..30d2eac0 100644 --- a/Adventures in Lestoria/assets/config/Monsters.txt +++ b/Adventures in Lestoria/assets/config/Monsters.txt @@ -45,7 +45,7 @@ Monsters CollisionDmg = 0 - MoveSpd = 80 + MoveSpd = 70 Size = 100 XP = 6 diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 385bd520..2065a412 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ