build 111

MaxiDonkey · Oct 24, 2020 · 404e9c3 · 404e9c3
1 parent fea7e90
commit 404e9c3
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 40 deletions.
diff --git a/Install/TaupeEye.iss b/Install/TaupeEye.iss
@@ -1,6 +1,6 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
+ 
 #define MyAppName "EDTaupeEye"
 #define MyAppVersion "0.9 beta"
 #define MyAppPublisher "Galactic 911"

diff --git a/TaupeEye.dproj b/TaupeEye.dproj
@@ -118,8 +118,8 @@
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
-        <VerInfo_Build>110</VerInfo_Build>
-        <VerInfo_Keys>CompanyName=Galactic 911;FileVersion=0.9.0.110;InternalName=TaupeEye;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=0.9.0.0;Comments=Elite Dangerous Tool;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Build>111</VerInfo_Build>
+        <VerInfo_Keys>CompanyName=Galactic 911;FileVersion=0.9.0.111;InternalName=TaupeEye;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=0.9.0.0;Comments=Elite Dangerous Tool;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -207,7 +207,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="ModelSupport_TaupeEye\default.txvpck" Configuration="Debug" Class="ProjectFile">
+                <DeployFile LocalName="ModelSupport_TaupeEye\uEyeXThread\default.txvpck" Configuration="Debug" Class="ProjectFile">
                     <Platform Name="Win64">
                         <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>
@@ -225,7 +225,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="ModelSupport_TaupeEye\uEyeXThread\default.txvpck" Configuration="Debug" Class="ProjectFile">
+                <DeployFile LocalName="ModelSupport_TaupeEye\default.txvpck" Configuration="Debug" Class="ProjectFile">
                     <Platform Name="Win64">
                         <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>

diff --git a/TaupeEye.res b/TaupeEye.res
diff --git a/Win64/Debug/TaupeEye.exe b/Win64/Debug/TaupeEye.exe
diff --git a/Win64/Debug/TaupeEye.rsm b/Win64/Debug/TaupeEye.rsm
diff --git a/uAreaTobii.pas b/uAreaTobii.pas
diff --git a/uEliteManager.pas b/uEliteManager.pas
@@ -1708,7 +1708,10 @@ procedure TCustomEliteManager.CockpitMode(const Mode: TCockpitModeType);
     cmt_combat      : if not EliteStatus.HudInanalysisMode then Exit;
     cmt_exploration : if EliteStatus.HudInanalysisMode then Exit;
   end;
-  FKeyInventory.KeyTrigger_( 'PlayerHUDModeToggle', WITH_KEYUP)
+  case EliteStatus.InSrv of
+    True : FKeyInventory.KeyTrigger_( 'PlayerHUDModeToggle_Buggy', WITH_KEYUP)
+    else FKeyInventory.KeyTrigger_( 'PlayerHUDModeToggle', WITH_KEYUP)
+  end;
 end; {CockpitMode}
 
 procedure TCustomEliteManager.ModeACS;

diff --git a/uEyeXThread.pas b/uEyeXThread.pas
@@ -279,7 +279,7 @@ implementation
 function GetScreenBounds(const Panel: TPanel): TRect;
 var originpoint: TPoint;
 begin
-	originpoint := Panel.ClientToScreen(point(0,0));
+  originpoint := Panel.ClientToScreen(point(0,0));
   result := TRect.Create(originpoint,Panel.Width,Panel.Height)
 end;