Skip to content

Commit fdefef1

Browse files
Fixed overly aggressive CBTMonitor which was causing the vessel highlighting to stop in the editor when FocusFollowsMouse was set
1 parent 4f332fc commit fdefef1

File tree

9 files changed

+34
-8
lines changed

9 files changed

+34
-8
lines changed

Changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
ChangeLog
22

3+
0.1.10.11
4+
Fixed overly aggressive CBTMonitor which was causing the vessel highlighting to stop in the editor when FocusFollowsMouse was set
5+
36
0.1.10.10
47
Fix nullrefs upong returning to mainmenu by adding check for no game loaded (ie: returning to main menu) in CBTMonitor.Update & CBTMonitor.LateUpdate
58

ClickThroughBlocker.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"MAJOR": 0,
1111
"MINOR": 1,
1212
"PATCH": 10,
13-
"BUILD": 10
13+
"BUILD": 11
1414
},
1515
"KSP_VERSION_MIN": {
1616
"MAJOR": 1,

ClickThroughBlocker/AssemblyVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
using System.Reflection;
77

8-
[assembly: AssemblyVersion("0.1.10.10")]
8+
[assembly: AssemblyVersion("0.1.10.11")]

ClickThroughBlocker/CBTMonitor.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
#if !DUMMY
55
namespace ClickThroughFix
66
{
7-
[KSPAddon(KSPAddon.Startup.SpaceCentre, true)]
7+
//[KSPAddon(KSPAddon.Startup.SpaceCentre, true)]
8+
[KSPAddon(KSPAddon.Startup.EditorAny, false)]
89
class CBTMonitor : MonoBehaviour
910
{
1011
void Start()
1112
{
12-
DontDestroyOnLoad(this);
13+
//DontDestroyOnLoad(this);
1314
// GameEvents.onGameSceneLoadRequested.Add(onGameSceneLoadRequested);
1415
ClickThruBlocker.CTBWin.activeBlockerCnt = 0;
1516
}
@@ -25,7 +26,9 @@ void onGameSceneLoadRequested(GameScenes gs)
2526
// the mouse moved over a protected window
2627
void Update()
2728
{
28-
if (HighLogic.CurrentGame == null || HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick)
29+
if (HighLogic.CurrentGame == null ||
30+
HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick) // ||
31+
//(!HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick && !HighLogic.LoadedSceneIsEditor))
2932
return;
3033
{
3134
if (ClickThruBlocker.CTBWin.activeBlockerCnt > 0)
@@ -66,7 +69,9 @@ void Update()
6669
int d;
6770
void LateUpdate()
6871
{
69-
if (HighLogic.CurrentGame == null || HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick)
72+
if (HighLogic.CurrentGame == null ||
73+
HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick) // ||
74+
//(!HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick && !HighLogic.LoadedSceneIsEditor))
7075
return;
7176

7277
d = 0;

GameData/000_ClickThroughBlocker/ClickThroughBlocker.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"MAJOR": 0,
1111
"MINOR": 1,
1212
"PATCH": 10,
13-
"BUILD": 10
13+
"BUILD": 11
1414
},
1515
"KSP_VERSION_MIN": {
1616
"MAJOR": 1,

GameData/000_ClickThroughBlocker/changelog.cfg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ KERBALCHANGELOG
55
license = Lesser GPLv3
66
author = Linuxgurugamer
77

8+
VERSION
9+
{
10+
version = 0.1.10.11
11+
CHANGE
12+
{
13+
change = Fixed overly aggressive CBTMonitor which was causing the vessel highlighting to stop in the editor when FocusFollowsMouse was set
14+
type = update
15+
}
16+
}
817
VERSION
918
{
1019
version = 0.1.10.10

buildRelease.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ rem Copy files to GameData locations
3636

3737
copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins"
3838
copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR%
39-
copy /Y ..\MiniAVC.dll %GAMEDATA%\%GAMEDIR%
4039

4140
if "%LICENSE%" NEQ "" copy /y %LICENSE% %GAMEDATA%\%GAMEDIR%
4241
if "%README%" NEQ "" copy /Y %README% %GAMEDATA%\%GAMEDIR%

changelog.cfg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ KERBALCHANGELOG
55
license = Lesser GPLv3
66
author = Linuxgurugamer
77

8+
VERSION
9+
{
10+
version = 0.1.10.11
11+
CHANGE
12+
{
13+
change = Fixed overly aggressive CBTMonitor which was causing the vessel highlighting to stop in the editor when FocusFollowsMouse was set
14+
type = update
15+
}
16+
}
817
VERSION
918
{
1019
version = 0.1.10.10

deploy.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ rem but not always
99

1010
set H=%KSPDIR%
1111
rem set H=R:\KSP_1.9.1_Tetrix
12+
set H=R:\KSP_1.8.1_dev
1213
set GAMEDIR=000_ClickThroughBlocker
1314
set GAMEDATA="GameData\"
1415
set VERSIONFILE=ClickThroughBlocker.version

0 commit comments

Comments
 (0)