diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index e9ff6b48..47b505df 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -4358,7 +4358,7 @@ void AiL::UpdateMonsters(){ AMonsterIsMarkedForDeletion(); continue; } - m->Update(game->GetElapsedTime()); + [[likely]]if(m->isBoss||m->GetDistanceFrom(GetPlayer()->GetPos())<40.f*24)m->Update(game->GetElapsedTime()); } for(Monster&m:game->monstersToBeSpawned){ size_t prevCapacity=MONSTER_LIST.capacity(); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index b1491de4..9a80e0ee 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 10915 +#define VERSION_BUILD 10918 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx index 2c228069..e0f472c4 100644 --- a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx +++ b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx @@ -603,7 +603,7 @@ - + @@ -795,6 +795,7 @@ + @@ -803,6 +804,10 @@ + + + + @@ -812,6 +817,7 @@ + @@ -828,6 +834,7 @@ + diff --git a/Adventures in Lestoria/assets/config/configuration.txt b/Adventures in Lestoria/assets/config/configuration.txt index cdb82979..6b81dbd2 100644 --- a/Adventures in Lestoria/assets/config/configuration.txt +++ b/Adventures in Lestoria/assets/config/configuration.txt @@ -140,7 +140,7 @@ location_font_size = Habbo,24 encrypted_font_size = Unknown,16 # Whether or not to show individual data accesses from config data structure. -debug_access_options = 1 +debug_access_options = 0 # Shows menu navigation debug output debug_menu_navigation_info = 0 diff --git a/Adventures in Lestoria/olcUTIL_DataFile.h b/Adventures in Lestoria/olcUTIL_DataFile.h index 20288f45..9864c4b5 100644 --- a/Adventures in Lestoria/olcUTIL_DataFile.h +++ b/Adventures in Lestoria/olcUTIL_DataFile.h @@ -216,7 +216,7 @@ namespace olc::utils // Access a datafile via a convenient name - "root.node.something.property" inline datafile& GetProperty(const std::string& name) { - if(DEBUG_ACCESS_OPTIONS)LOG(std::format("Accessing Property {}",name)); + [[unlikely]]if(DEBUG_ACCESS_OPTIONS)LOG(std::format("Accessing Property {}",name)); size_t x = name.find_first_of('.'); if (x != std::string::npos) { diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 820d640d..26e8e5c3 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ