From d0ba05eb287f4be13294c2e70052fb12dca56c94 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Wed, 15 May 2013 03:31:05 +0000 Subject: [PATCH] N64: Fix an exception with the plugin config system --- BizHawk.MultiClient/MainForm.cs | 2 +- .../N64tools/N64VideoPluginconfig.cs | 2 +- .../output/dll/mupen64plus-video-rice.dll | Bin 496640 -> 496640 bytes .../mupen64plus-video-rice/src/Config.cpp | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index b4f599e8fc..3ddb881bbe 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -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")); diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs index 6c1966aed7..0681157ec2 100644 --- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs +++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs @@ -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"); diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-video-rice.dll b/BizHawk.MultiClient/output/dll/mupen64plus-video-rice.dll index 933e0761256be48edcdd96e8bd68b549d637fb26..db7ba255c9be0fe8d480fde0d0a61442726cc56f 100644 GIT binary patch delta 20380 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 Xy)VICFUS3E3-1i?mdHA<-ckPtS#@?Z delta 20123 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 diff --git a/libmupen64plus/mupen64plus-video-rice/src/Config.cpp b/libmupen64plus/mupen64plus-video-rice/src/Config.cpp index 1cb54e09e7..58b65a1d1e 100644 --- a/libmupen64plus/mupen64plus-video-rice/src/Config.cpp +++ b/libmupen64plus/mupen64plus-video-rice/src/Config.cpp @@ -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");