chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added net6 back.

Browse Source
This commit is contained in:
Razmoth
2023-01-07 20:58:12 +04:00
parent 94d73398ca
commit 37f816f800
19 changed files with 219 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@@ -1045,8 +1045,8 @@ namespace AssetStudioGUI
Marshal.Copy(m_Font.m_FontData, 0, data, m_Font.m_FontData.Length);
uint cFonts = 0;
var re = FontHelper.AddFontMemResourceEx(data, (uint)m_Font.m_FontData.Length, nint.Zero, ref cFonts);
if (re != nint.Zero)
var re = FontHelper.AddFontMemResourceEx(data, (uint)m_Font.m_FontData.Length, IntPtr.Zero, ref cFonts);
if (re != IntPtr.Zero)
{
using (var pfc = new PrivateFontCollection())
{
@@ -2048,7 +2048,7 @@ namespace AssetStudioGUI
Application.Exit();
}
result = system.init(2, FMOD.INITFLAGS.NORMAL, nint.Zero);
result = system.init(2, FMOD.INITFLAGS.NORMAL, IntPtr.Zero);
if (ERRCHECK(result)) { return; }
result = system.getMasterSoundGroup(out masterSoundGroup);