Merge branch 'develop'

kagikn · Sep 5, 2017 · 884569b · 884569b
2 parents 77b70ae + a204225
commit 884569b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/StuntBonusV/Extensions.cs b/StuntBonusV/Extensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -46,6 +46,7 @@ int GetWheelPtrCollectionOffset()
                 offset = (Game.Version >= GameVersion.VER_1_0_877_1_STEAM ? 0xAE0 : offset);
                 offset = (Game.Version >= GameVersion.VER_1_0_944_2_STEAM ? 0xB10 : offset);
                 offset = (Game.Version >= GameVersion.VER_1_0_1103_2_STEAM ? 0xB20 : offset);
+                offset = (Game.Version >= GameVersion.VER_1_0_1180_2_STEAM ? 0xB40 : offset);
 
                 return offset;
             }

diff --git a/StuntBonusV/Properties/AssemblyInfo.cs b/StuntBonusV/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,5 +32,5 @@
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 以下のように '*' を使用します:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
diff --git a/StuntBonusV/StuntBonusMonitor/InsaneStuntBonus.cs b/StuntBonusV/StuntBonusMonitor/InsaneStuntBonus.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -132,6 +132,11 @@ internal void OnTick(object o, EventArgs e)
                 {
                     _isStunting = false;
 
+                    if (!player.IsInVehicle())
+                    {
+                        return;
+                    }
+
                     var endVehiclePos = _currentVehicle.Position;
 
                     var stuntHeight = _maxVehicleZPos - _initVehiclePos.Z;