diff --git a/config/ConfigFormUnit.dfm b/config/ConfigFormUnit.dfm index 0e04389..3674d66 100644 --- a/config/ConfigFormUnit.dfm +++ b/config/ConfigFormUnit.dfm @@ -4,9 +4,9 @@ object ConfigForm: TConfigForm BorderIcons = [biSystemMenu, biMinimize] BorderStyle = bsSingle Caption = 'cnc-ddraw config' - ClientHeight = 475 - ClientWidth = 708 - Color = clBlack + ClientHeight = 481 + ClientWidth = 704 + Color = clHotLight Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -2677,10 +2677,9 @@ object ConfigForm: TConfigForm 61C0650530766087F0B9DE67A1EF3B173173597F3B695CC608E0B202F8FC22D7 BBBF4CD8CBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCBB88CCB B88CB18EFF1FA2974C1C31AF16A40000000049454E44AE426082} - OldCreateOrder = False Position = poDesktopCenter + StyleElements = [seFont, seBorder] OnCreate = FormCreate - PixelsPerInch = 96 TextHeight = 13 object AdvancedPnl: TPanel Left = 201 @@ -3250,16 +3249,17 @@ object ConfigForm: TConfigForm Width = 201 Height = 465 BevelOuter = bvNone - Color = clBlack + Color = clHotLight ParentBackground = False TabOrder = 0 + StyleElements = [seFont, seBorder] DesignSize = ( 201 465) object DisplayBtn: TSpeedButton Left = 5 Top = 8 - Width = 187 + Width = 190 Height = 41 Anchors = [akLeft, akTop, akRight] Caption = 'Display Settings' @@ -3270,13 +3270,13 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [fsBold] ParentFont = False - StyleElements = [seFont, seBorder] + StyleElements = [seClient, seBorder] OnClick = DisplayBtnClick end object AdvancedBtn: TSpeedButton Left = 5 Top = 55 - Width = 187 + Width = 190 Height = 41 Anchors = [akLeft, akTop, akRight] Caption = 'Advanced Settings' @@ -3287,12 +3287,13 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [fsBold] ParentFont = False + StyleElements = [seClient, seBorder] OnClick = AdvancedBtnClick end object CompatibilityBtn: TSpeedButton Left = 5 Top = 102 - Width = 187 + Width = 190 Height = 41 Anchors = [akLeft, akTop, akRight] Caption = 'Compatibility Settings' @@ -3303,6 +3304,7 @@ object ConfigForm: TConfigForm Font.Name = 'Segoe UI' Font.Style = [fsBold] ParentFont = False + StyleElements = [seClient, seBorder] OnClick = CompatibilityBtnClick end end diff --git a/config/cnc-ddraw config.cbproj b/config/cnc-ddraw config.cbproj index 3ac67c6..c2b58b6 100644 --- a/config/cnc-ddraw config.cbproj +++ b/config/cnc-ddraw config.cbproj @@ -1,7 +1,7 @@  {E020D5C7-AE07-4DB9-9688-6D289E9FFF1A} - 18.8 + 19.5 VCL Application cnc-ddraw config.cpp @@ -9,6 +9,7 @@ Release Win32 1 + c true @@ -18,6 +19,11 @@ Base true + + true + Base + true + true Base @@ -29,6 +35,12 @@ true true + + true + Cfg_1 + true + true + true Base @@ -40,6 +52,12 @@ true true + + true + Cfg_2 + true + true + JPHNE true @@ -52,7 +70,7 @@ $(BDSLIB)\$(PLATFORM)\release\$(LANGDIR);$(ILINK_TranslatedLibraryPath) CppVCLApplication System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) - rtl.lib;vcl.lib;vclwinx.lib;vclimg.lib + rtl.lib;vcl.lib;vclwinx.lib;vclimg.lib;bindengine.lib <_TCHARMapping>wchar_t true $(BDS)\bin\cbuilder_PROJECTICON.ico @@ -61,7 +79,7 @@ cnc-ddraw\config\;$(IncludePath) cnc-ddraw\config\;$(ILINK_LibraryPath) cnc-ddraw_config - "Windows10 Blue|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Blue.vsf" + Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf adortl;appanalytics;bcbie;bcbsmp;bindcomp;bindcompdbx;bindcompfmx;bindcompvcl;bindengine;CloudService;CustomIPTransport;dbexpress;dbrtl;dbxcds;DbxClientDriver;DbxCommonDriver;DBXInterBaseDriver;DBXMySQLDriver;DBXSqliteDriver;dsnap;dsnapcon;dsnapxml;FireDAC;FireDACADSDriver;FireDACCommon;FireDACCommonDriver;FireDACCommonODBC;FireDACIBDriver;FireDACMSAccDriver;FireDACMySQLDriver;FireDACPgDriver;FireDACSqliteDriver;fmx;fmxase;fmxdae;fmxFireDAC;fmxobj;IndyCore;IndyIPClient;IndyIPCommon;IndyIPServer;IndyProtocols;IndySystem;inet;inetdb;inetdbxpress;RESTBackendComponents;RESTComponents;rtl;soapmidas;soaprtl;soapserver;svn;tethering;vcl;vclactnband;vcldb;vcldsnap;vclFireDAC;vclie;vclimg;VCLRESTComponents;VclSmp;vcltouch;vclwinx;vclx;xmlrtl;$(PackageImports) @@ -73,6 +91,14 @@ 1033 $(BDS)\bin\default_app.manifest + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + $(BDS)\bin\default_app.manifest + false true @@ -105,22 +131,28 @@ false false rtl.lib;vcl.lib;vclwinx.lib;vclimg.lib + $(BDSLIB)\$(PLATFORM)$(CC_SUFFIX)\debug;$(ILINK_LibraryPath) + + + PerMonitorV2 NDEBUG;$(Defines) None - true PerMonitorV2 false false false true - rtl.lib;vcl.lib;vclwinx.lib;vclimg.lib + rtl.lib;vcl.lib;vclwinx.lib;vclimg.lib;bindengine.lib 1033 cnc-ddraw.ico + + PerMonitorV2 + 0 @@ -160,10 +192,6 @@ PngImage_US - - Cfg_2 - Base - Base @@ -171,6 +199,10 @@ Cfg_1 Base + + Cfg_2 + Base + CPlusPlusBuilder.Personality.12 @@ -187,125 +219,78 @@ cnc-ddraw config.cpp - Embarcadero C++Builder-Package für Office 2000-Server - Embarcadero C++Builder-Package für Office XP-Server + Embarcadero C++Builder-Package für Office 2000-Server + Embarcadero C++Builder-Package für Office XP-Server - - - - true - - + true - - - true - - - - - true - - - - - true - - true - - - true - - + + true - + + + true - - - cnc-ddraw_config.exe - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - .\ - true - - - - - cnc-ddraw_config.exe - true - - - - - .\ - true - - - + true - + true - + + + - .\ true - - - true - - - + - .\ true + + + + + true + + + + + true + + + + + + + + + + + 1 @@ -318,14 +303,14 @@ 0 - + classes - 1 + 64 classes - 1 + 64 @@ -446,6 +431,16 @@ 1 + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + res\drawable-ldpi @@ -609,6 +604,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -622,7 +622,7 @@ 1 .dylib - + 1 .dylib @@ -636,6 +636,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -650,7 +655,7 @@ 1 .dylib - + 1 .dylib @@ -664,6 +669,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -682,7 +692,7 @@ 0 - + 0 @@ -693,272 +703,12 @@ Contents\Resources\StartUp\ 0 - + + Contents\Resources\StartUp\ 0 - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 + + 0 @@ -969,61 +719,15 @@ 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - 1 - - - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + @@ -1034,6 +738,10 @@ ..\ 1 + + ..\ + 1 + @@ -1044,6 +752,10 @@ Contents 1 + + Contents + 1 + @@ -1054,6 +766,10 @@ Contents\Resources 1 + + Contents\Resources + 1 + @@ -1070,7 +786,7 @@ 1 - + 1 @@ -1084,6 +800,10 @@ Contents\MacOS 1 + + Contents\MacOS + 1 + 0 @@ -1102,6 +822,66 @@ 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + ..\ + 1 + + + ..\ + 1 + + + ..\ + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).launchscreen + 64 + + + ..\$(PROJECTNAME).launchscreen + 64 + + + + + 1 + + + 1 + + + 1 + + Assets @@ -1122,19 +902,222 @@ 1 - - - - - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + - - + + + + + + + + + + True + False 12 diff --git a/config/cnc-ddraw config.cpp b/config/cnc-ddraw config.cpp index e98fba6..d0dbb6f 100644 --- a/config/cnc-ddraw config.cpp +++ b/config/cnc-ddraw config.cpp @@ -14,7 +14,7 @@ int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int) { Application->Initialize(); Application->MainFormOnTaskBar = true; - TStyleManager::TrySetStyle("Windows10 Blue"); + TStyleManager::TrySetStyle("Windows10"); Application->CreateForm(__classid(TConfigForm), &ConfigForm); Application->Run(); } diff --git a/src/config.c b/src/config.c index 8413326..333f2dc 100644 --- a/src/config.c +++ b/src/config.c @@ -344,7 +344,7 @@ static void cfg_create_ini() "max_resolutions=0\n" "limit_bltfast=false\n" "game_handles_close=false\n" - "fixpitch=true\n" + "fixpitch=false\n" "fixnotresponding=false\n" "lock_surfaces=false\n" "releasealt=false\n"