Merge pull request #875 from WALLOFJUSTICE/dev23-q4

* hotfixes
TurningWheel · Jan 30, 2025 · 2baf1ea · 2baf1ea
2 parents d76e7bb + cd5c388
commit 2baf1ea
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/VS.2015/Barony/Barony.vcxproj b/VS.2015/Barony/Barony.vcxproj
@@ -912,7 +912,7 @@ copy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)EOS 4\barony_test.exe" </Com
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmodL_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;EOSSDK-Win64-Shipping.lib;steam_api64.lib;libtheoraplayer.lib;glew32.lib;nfd.lib;libcurl.lib;ws2_32.lib;Normaliz.lib;Crypt32.lib;Wldap32.lib;XPlatCppWindows_debug.lib;lib_json_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;EOSSDK-Win64-Shipping.lib;steam_api64.lib;libtheoraplayer.lib;glew32.lib;nfd.lib;libcurl.lib;ws2_32.lib;Normaliz.lib;Crypt32.lib;Wldap32.lib;XPlatCppWindows_debug.lib;lib_json_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <Profile>true</Profile>
     </Link>

diff --git a/src/acthudweapon.cpp b/src/acthudweapon.cpp
@@ -1809,7 +1809,7 @@ void actHudWeapon(Entity* my)
 					}
 
 
-					if ( thrownWeapon && multiplayer == CLIENT )
+					if ( multiplayer == CLIENT && (thrownWeapon || (stats[HUDWEAPON_PLAYERNUM]->weapon && itemCategory(stats[HUDWEAPON_PLAYERNUM]->weapon) == POTION)) )
 					{
 						Item* item = stats[HUDWEAPON_PLAYERNUM]->weapon;
 						if ( item )

diff --git a/src/eos.hpp b/src/eos.hpp
@@ -533,6 +533,11 @@ class EOSFuncs
 				}
 			}
 		}
+		if ( LobbySearchResults.CurrentLobbySearch )
+		{
+			EOS_LobbySearch_Release(LobbySearchResults.CurrentLobbySearch);
+			LobbySearchResults.CurrentLobbySearch = nullptr;
+		}
 		AccountManager.deinit();
 		UnsubscribeFromConnectionRequests();
 		SetNetworkAvailable(false);

diff --git a/src/ui/MainMenu.cpp b/src/ui/MainMenu.cpp
@@ -20451,6 +20451,15 @@ namespace MainMenu {
 		frame_right->setActualSize(SDL_Rect{0, 0, 304, 414});
 		frame_right->setBorder(0);
 		frame_right->setColor(0);
+		frame_right->setTickCallback([](Widget& widget) {
+			if ( Frame* frame = static_cast<Frame*>(&widget) )
+			{
+				for ( auto button : frame->getButtons() )
+				{
+					button->setDisabled(frame->isInvisible());
+				}
+			}
+		});
 		{
 		    frame_right->addImage(
 			    frame_right->getActualSize(),
@@ -21392,6 +21401,8 @@ namespace MainMenu {
 				frame_right->setInvisible(!lobbyFiltersEnabled && !frame_right->isInvisible());
 			}
 
+			frame_right->getTickCallback()(*frame_right);
+
 			/*clearLobbies();
 			for (auto& lobby : lobbies) {
 				addLobby(lobby);