From c44204cf7c743181cd6bfb5eedd79ff9c113f460 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 20 Nov 2016 22:08:50 -0800 Subject: [PATCH] Fix Height/Weight writeback Closes #39, thanks @ MightyBirdy! --- pk3DS/Subforms/Gen6/PersonalEditor6.cs | 6 ++++-- pk3DS/Subforms/Gen7/PersonalEditor7.cs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.cs index fdc8624..4c201cb 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.cs @@ -311,8 +311,10 @@ private void savePersonal() pkm.Color = (byte) (Convert.ToByte(CB_Color.SelectedIndex) | (Convert.ToByte(TB_RawColor.Text) & 0xF0)); pkm.BaseEXP = Convert.ToUInt16(TB_BaseExp.Text); - pkm.Height = (int)Convert.ToDouble(TB_Height.Text)*100; - pkm.Weight = (int)Convert.ToDouble(TB_Weight.Text)*10; + decimal h; decimal.TryParse(TB_Height.Text, out h); + decimal w; decimal.TryParse(TB_Weight.Text, out w); + pkm.Height = (int)(h*100); + pkm.Weight = (int)(w*10); for (int i = 0; i < CLB_TMHM.Items.Count; i++) pkm.TMHM[i] = CLB_TMHM.GetItemChecked(i); diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.cs index 5f6aaff..1548a9b 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.cs @@ -246,8 +246,10 @@ private void savePersonal() pkm.Color = (byte) (Convert.ToByte(CB_Color.SelectedIndex) | (Convert.ToByte(TB_RawColor.Text) & 0xF0)); pkm.BaseEXP = Convert.ToUInt16(TB_BaseExp.Text); - pkm.Height = (int)Convert.ToDouble(TB_Height.Text)*100; - pkm.Weight = (int)Convert.ToDouble(TB_Weight.Text)*10; + decimal h; decimal.TryParse(TB_Height.Text, out h); + decimal w; decimal.TryParse(TB_Weight.Text, out w); + pkm.Height = (int)(h * 100); + pkm.Weight = (int)(w * 10); for (int i = 0; i < CLB_TMHM.Items.Count; i++) pkm.TMHM[i] = CLB_TMHM.GetItemChecked(i);