feat: new windows icon, update 4JLibs & vsync stuff

Minecraft.Client/Minecraft.Client.vcxproj

@@ -35540,7 +35540,15 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+    </Image>
+    <Image Include="Xbox\MinecraftWindows64.ico">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
     </Image>
     <Image Include="Xbox\small.ico">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -6234,6 +6234,9 @@
     <Image Include="Xbox\MinecraftWindows.ico">
       <Filter>Windows</Filter>
     </Image>
+    <Image Include="Xbox\MinecraftWindows64.ico">
+      <Filter>Windows</Filter>
+    </Image>
     <Image Include="Xbox\small.ico">
       <Filter>Windows</Filter>
     </Image>

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -370,7 +370,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 	wcex.hbrBackground	= (HBRUSH)(COLOR_WINDOW+1);
 	wcex.lpszMenuName	= "Minecraft";
 	wcex.lpszClassName	= "MinecraftClass";
-	wcex.hIconSm		= LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MINECRAFTWINDOWS));
+	wcex.hIconSm		= LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MINECRAFTWINDOWS64));
 
 	return RegisterClassEx(&wcex);
 }
@@ -744,11 +744,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 	app.loadMediaArchive();
 
-	if(launchArgs.vsync)
-	{
-		RenderManager.SetVSync(false); //str1k3r - vsync is set to true by default in 4JLibs
-	}
-
 	RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
 
 	//str1k3r - set the resolution that we have at time of launch
@@ -879,7 +874,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 		ui.render();
 
 		//str1k3r - update RenderManager's & gdraw's resolution
-		RenderManager.setResolution(g_iScreenWidth, g_iScreenHeight);
 		ui.updateResolution(g_iScreenWidth, g_iScreenHeight);
 
 		// Present the frame.
@@ -903,6 +897,19 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 		wasF11Pressed = isF11Pressed;
 
+		if(app.GetGameStarted())
+		{
+			if(ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()))
+			{
+				if(launchArgs.vsync) RenderManager.SetVSync(true);
+			}
+			else
+			{
+				if(launchArgs.vsync) RenderManager.SetVSync(false);
+			}
+		}
+		if(launchArgs.vsync && !app.GetGameStarted()) RenderManager.SetVSync(true);
+
 		// 4J-PB - Update the trial timer display if we are in the trial version
 		if(!ProfileManager.IsFullVersion())
 		{