ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

N64: Fix an exception with the plugin config system

This commit is contained in:
pjgat09 2013-05-15 03:31:05 +00:00
parent e64011e1c2
commit d0ba05eb28
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/MainForm.cs
View File

@ -3920,7 +3920,7 @@ namespace BizHawk.MultiClient
video_settings.Parameters.Add("FastTextureCRC", N64GetIntFromDB("RiceFastTextureCRC", 0));
video_settings.Parameters.Add("EmulateClear", N64GetBoolFromDB("RiceEmulateClear"));
video_settings.Parameters.Add("ForceScreenClear", N64GetBoolFromDB("RiceForceScreenClear"));
video_settings.Parameters.Add("AccurateTextureMapping", N64GetIntFromDB("RiceAccurateTextureMapping", 0));
video_settings.Parameters.Add("AccurateTextureMappingHack", N64GetIntFromDB("RiceAccurateTextureMappingHack", 0));
video_settings.Parameters.Add("NormalBlender", N64GetIntFromDB("RiceNormalBlender", 0));
video_settings.Parameters.Add("DisableBlender", N64GetBoolFromDB("RiceDisableBlender"));
video_settings.Parameters.Add("ForceDepthBuffer", N64GetBoolFromDB("RiceForceDepthBuffer"));

2
BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
View File

@ -253,7 +253,7 @@ namespace BizHawk.MultiClient
RiceFastTextureCRC_Combo.SelectedIndex = GetIntFromDB("RiceFastTextureCRC", 0);
RiceEmulateClear_CB.Checked = GetBoolFromDB("RiceEmulateClear");
RiceForceScreenClear_CB.Checked = GetBoolFromDB("RiceForceScreenClear");
RiceAccurateTextureMappingHack_Combo.SelectedIndex = GetIntFromDB("RiceAccurateTextureMapping", 0);
RiceAccurateTextureMappingHack_Combo.SelectedIndex = GetIntFromDB("RiceAccurateTextureMappingHack", 0);
RiceNormalBlender_Combo.SelectedIndex = GetIntFromDB("RiceNormalBlender", 0);
RiceDisableBlender_CB.Checked = GetBoolFromDB("RiceDisableBlender");
RiceForceDepthBuffer_CB.Checked = GetBoolFromDB("RiceForceDepthBuffer");

BIN
BizHawk.MultiClient/output/dll/mupen64plus-video-rice.dll
View File

Binary file not shown.

4
libmupen64plus/mupen64plus-video-rice/src/Config.cpp
View File

@ -381,7 +381,7 @@ BOOL InitConfiguration(void)
ConfigSetDefaultBool(l_ConfigVideoRice, "EmulateClear", FALSE, "...?");
ConfigSetDefaultBool(l_ConfigVideoRice, "ForceScreenClear", FALSE, "...?");
ConfigSetDefaultInt(l_ConfigVideoRice, "AccurateTextureMapping", 0, "...?");
ConfigSetDefaultInt(l_ConfigVideoRice, "AccurateTextureMappingHack", 0, "...?");
ConfigSetDefaultInt(l_ConfigVideoRice, "NormalBlender", 0, "...?");
ConfigSetDefaultBool(l_ConfigVideoRice, "DisableBlender", FALSE, "...?");
@ -775,7 +775,7 @@ void Ini_GetRomOptions(LPGAMESETTING pGameSetting)
pGameSetting->dwFastTextureCRC = ConfigGetParamInt(l_ConfigVideoRice, "FastTextureCRC");
pGameSetting->bEmulateClear = ConfigGetParamBool(l_ConfigVideoRice, "EmulateClear");
pGameSetting->bForceScreenClear = ConfigGetParamBool(l_ConfigVideoRice, "ForceScreenClear");
pGameSetting->dwAccurateTextureMapping = ConfigGetParamInt(l_ConfigVideoRice, "AccurateTextureMapping");
pGameSetting->dwAccurateTextureMapping = ConfigGetParamInt(l_ConfigVideoRice, "AccurateTextureMappingHack");
pGameSetting->dwNormalBlender = ConfigGetParamInt(l_ConfigVideoRice, "NormalBlender");
pGameSetting->bDisableBlender = ConfigGetParamBool(l_ConfigVideoRice, "DisableBlender");
pGameSetting->dwNormalCombiner = ConfigGetParamInt(l_ConfigVideoRice, "NormalCombiner");