Fixed bugs. Version update to 1.4.1

Author: FakelsHub

sFall Configuration/MainForm.Designer.vb

@@ -132,9 +132,6 @@
   <metadata name="ToolTip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>111, 17</value>
   </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="nudShowNameBar.ToolTip" xml:space="preserve">
     <value>Установите номер свободного слота для отображения имени контролируемого напарника над панелью интерфейса.
 Значение должно указывать на свободный слот. Используйте значение 9 в качестве свободного слота (не используйте значения 1...4).
@@ -157,6 +154,9 @@
   <metadata name="ToolTip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>337, 17</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>205, 17</value>
   </metadata>

sFall Configuration/MainForm.resx

@@ -56,7 +56,7 @@ Public Class MainForm
             ComboBox8.SelectedIndex = 0
         End If
 
-        'On Error Resume Next
+        On Error Resume Next
 
         cbDisplayKarma.Checked = CBool(GetIni_Param("DisplayKarmaChanges"))
         cbScrollingQuestsList.Checked = CBool(GetIni_Param("UseScrollingQuestsList"))
@@ -99,14 +99,19 @@ Public Class MainForm
         Dim chBool As Boolean
         Dim n As Integer = Get_Section_Line("[Speed]")
         For n = n + 1 To Ddraw_ini.Count - 1
-            If GetIni_NameParam(Ddraw_ini(n)) = "enable" Then
+            If GetIni_NameParam(Ddraw_ini(n)).ToLower = "enable" Then
                 chBool = CBool(GetIni_ValueParam(Ddraw_ini(n)))
                 Exit For
             End If
         Next
         If GetIni_Param("SpeedMultiInitial") = "200" And chBool Then cbSpeedMultiInit.Checked = True
         '
-        cbWeaponAmmoCost.Checked = CBool(GetIni_Param("CheckWeaponAmmoCost"))
+        valueStr = GetIni_Param("CheckWeaponAmmoCost")
+        If valueStr <> Nothing Then
+            cbWeaponAmmoCost.Enabled = True
+            cbWeaponAmmoCost.CheckState = CheckState.Unchecked
+            cbWeaponAmmoCost.Checked = CBool(valueStr)
+        End If
         cbExtraSaveSlots.Checked = CBool(GetIni_Param("ExtraSaveSlots"))
 
         valueStr = GetIni_Param("ReloadWeaponKey")
@@ -1098,7 +1103,7 @@ EXITAPP:
         Dim Ddraw_old() As String = File.ReadAllLines(OpenFileDialog1.FileName, Encoding.Default)
         For Each line As String In Ddraw_old
             strprm = GetIni_NameParam(line)
-            If strprm <> Nothing Then
+            If strprm <> String.Empty Then
                 strval = GetIni_ValueParam(line)
                 If strval <> Nothing Then
                     If GetIni_Param(strprm) <> Nothing Then

sFall Configuration/MainForm.vb

@@ -168,7 +168,7 @@ Module M_Module
 
         param = param.ToLower
         For n As Integer = 0 To UBound(iniData)
-            If GetIni_NameParam(iniData(n)) = param Then
+            If GetIni_NameParam(iniData(n)).ToLower = param Then
                 Return GetIni_ValueParam(iniData(n))
             End If
         Next
@@ -179,7 +179,7 @@ Module M_Module
     Friend Function GetIni_Param(ByVal param As String) As String
         param = param.ToLower
         For Each line As String In Ddraw_ini
-            If GetIni_NameParam(line) = param Then
+            If GetIni_NameParam(line).ToLower = param Then
                 Return GetIni_ValueParam(line)
             End If
         Next
@@ -188,9 +188,9 @@ Module M_Module
 
     Friend Function GetIni_NameParam(ByVal str As String) As String
         Dim m As Integer = InStr(2, str, "=")
-        If m = 0 Then Return Nothing
+        If m = 0 Then Return String.Empty
         'возвращаем
-        Return str.Substring(0, m - 1).ToLower
+        Return str.Substring(0, m - 1)
     End Function
 
     Friend Function GetIni_ValueParam(ByVal str As String) As String
@@ -207,7 +207,7 @@ Module M_Module
 
         param = param.ToLower
         For n As Integer = 0 To UBound(iniData)
-            If GetIni_NameParam(iniData(n)) = param Then
+            If GetIni_NameParam(iniData(n)).ToLower = param Then
                 Dim m As Integer = iniData(n).IndexOf("=", 2)
                 If m <= 0 Then Exit Sub
                 'записываем
@@ -220,7 +220,7 @@ Module M_Module
     Friend Sub SetIni_ParamValue(ByVal param As String, ByVal value As String)
         param = param.ToLower
         For n As Integer = 0 To Ddraw_ini.Count - 1
-            If GetIni_NameParam(Ddraw_ini(n)) = param Then
+            If GetIni_NameParam(Ddraw_ini(n)).ToLower = param Then
                 Set_Value(n, value)
                 Exit Sub
             End If
@@ -231,13 +231,17 @@ Module M_Module
         Dim m As Integer = Ddraw_ini(z).IndexOf("=", 2)
         If m <= 0 Then Exit Sub
         'записываем
-        Ddraw_ini(z) = Ddraw_ini(z).Remove(m + 1) & value
+        If m >= Ddraw_ini(z).Length - 1 Then
+            Ddraw_ini(z) = Ddraw_ini(z) & value
+        Else
+            Ddraw_ini(z) = Ddraw_ini(z).Remove(m + 1) & value
+        End If
     End Sub
 
     Friend Function GetIni_Param_Line(ByVal param As String) As Integer
         param = param.ToLower
         For n As Integer = 0 To Ddraw_ini.Count - 1
-            If GetIni_NameParam(Ddraw_ini(n)) = param Then
+            If GetIni_NameParam(Ddraw_ini(n)).ToLower = param Then
                 Return n
             End If
         Next
@@ -271,7 +275,7 @@ Module M_Module
         If val > 1 Then val = 1
 
         For n = n + 1 To Ddraw_ini.Count - 1
-            If GetIni_NameParam(Ddraw_ini(n)) = "enable" Then
+            If GetIni_NameParam(Ddraw_ini(n)).ToLower = "enable" Then
                 Ddraw_ini(n) = "Enable=" + CStr(val)
             End If
         Next

sFall Configuration/Module.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' используя "*", как показано ниже:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.4.0.0")> 
-<Assembly: AssemblyFileVersion("1.4.0.0")> 
+<Assembly: AssemblyVersion("1.4.1.0")> 
+<Assembly: AssemblyFileVersion("1.4.1.0")>