lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 2ae32bd086 into 33f2b91c99

Browse source
This commit is contained in:
Tiagoquix 2025-04-08 07:20:06 -03:00 committed by GitHub
commit ed8cd34302
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -12,7 +12,7 @@ cnc-ddraw can fix compatibility issues in older 2D games, such as black screen,
- Alt+Enter support to switch quickly between Fullscreen and Windowed mode - Alt+Enter support to switch quickly between Fullscreen and Windowed mode
- Automatically saves and restores window position/size/state - Automatically saves and restores window position/size/state
- FPS Limiter - FPS Limiter
- VSync - Vertical Synchronization (V-Sync)
- Optional mouse sensitivity scaling - Optional mouse sensitivity scaling
- Preliminary libretro shader support - https://github.com/libretro/glsl-shaders - Preliminary libretro shader support - https://github.com/libretro/glsl-shaders
- ... - ...

20
config/ConfigFormUnit.cpp
View file

@ -217,7 +217,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Restaurar la configuración predeterminada"; RestoreDefaultsBtn->Caption = L"Restaurar la configuración predeterminada";
PresentationLbl->Caption = L"Presentación"; PresentationLbl->Caption = L"Presentación";
MaintasLbl->Caption = L"Mantener la relación de aspecto"; MaintasLbl->Caption = L"Mantener la relación de aspecto";
VsyncLbl->Caption = L"Activar VSync"; VsyncLbl->Caption = L"Activar V-Sync";
AdjmouseLbl->Caption = L"Ajustar sensibilidad de ratón"; AdjmouseLbl->Caption = L"Ajustar sensibilidad de ratón";
DevmodeLbl->Caption = L"Bloquear cursor a la ventana / pantalla"; DevmodeLbl->Caption = L"Bloquear cursor a la ventana / pantalla";
RendererLbl->Caption = L"Renderizador"; RendererLbl->Caption = L"Renderizador";
@ -298,7 +298,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Standardeinstellungen wiederherstellen"; RestoreDefaultsBtn->Caption = L"Standardeinstellungen wiederherstellen";
PresentationLbl->Caption = L"Darstellung"; PresentationLbl->Caption = L"Darstellung";
MaintasLbl->Caption = L"Seitenverhältnis beibehalten"; MaintasLbl->Caption = L"Seitenverhältnis beibehalten";
VsyncLbl->Caption = L"VSync aktiveren"; VsyncLbl->Caption = L"V-Sync aktiveren";
AdjmouseLbl->Caption = L"Mausempfindlichkeit anpassen"; AdjmouseLbl->Caption = L"Mausempfindlichkeit anpassen";
DevmodeLbl->Caption = L"Sperre Cursor zu Fenster / Bildschirm"; //Not 100% sure, if not a better translation exists DevmodeLbl->Caption = L"Sperre Cursor zu Fenster / Bildschirm"; //Not 100% sure, if not a better translation exists
RendererLbl->Caption = L"Renderer"; RendererLbl->Caption = L"Renderer";
@ -381,7 +381,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Восстановить настройки по умолчанию"; RestoreDefaultsBtn->Caption = L"Восстановить настройки по умолчанию";
PresentationLbl->Caption = L"Отображение"; PresentationLbl->Caption = L"Отображение";
MaintasLbl->Caption = L"Сохранять соотношение сторон"; MaintasLbl->Caption = L"Сохранять соотношение сторон";
VsyncLbl->Caption = L"Включить VSync"; VsyncLbl->Caption = L"Включить V-Sync";
AdjmouseLbl->Caption = L"Регулировка чувствительности мыши"; AdjmouseLbl->Caption = L"Регулировка чувствительности мыши";
DevmodeLbl->Caption = L"Зафиксировать курсор на окне / экране"; DevmodeLbl->Caption = L"Зафиксировать курсор на окне / экране";
RendererLbl->Caption = L"Рендер"; RendererLbl->Caption = L"Рендер";
@ -462,7 +462,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Visszaállítja az alapértelmezett beállításokat"; RestoreDefaultsBtn->Caption = L"Visszaállítja az alapértelmezett beállításokat";
PresentationLbl->Caption = L"Bemutató"; PresentationLbl->Caption = L"Bemutató";
MaintasLbl->Caption = L"Képarány megtartása"; MaintasLbl->Caption = L"Képarány megtartása";
VsyncLbl->Caption = L"VSync bekapcsolása"; VsyncLbl->Caption = L"V-Sync bekapcsolása";
AdjmouseLbl->Caption = L"Egérérzékenység beállítás"; AdjmouseLbl->Caption = L"Egérérzékenység beállítás";
DevmodeLbl->Caption = L"Kurzor bezárása az ablakba / képbe"; DevmodeLbl->Caption = L"Kurzor bezárása az ablakba / képbe";
RendererLbl->Caption = L"Renderelő"; RendererLbl->Caption = L"Renderelő";
@ -543,7 +543,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Restaurer les paramètres par défaut"; RestoreDefaultsBtn->Caption = L"Restaurer les paramètres par défaut";
PresentationLbl->Caption = L"Présentation"; PresentationLbl->Caption = L"Présentation";
MaintasLbl->Caption = L"Conserver les proportions de l'image"; MaintasLbl->Caption = L"Conserver les proportions de l'image";
VsyncLbl->Caption = L"Activer la synchro verticale (VSync)"; VsyncLbl->Caption = L"Activer la synchro verticale (V-Sync)";
AdjmouseLbl->Caption = L"Ajuster la sensibilité souris"; AdjmouseLbl->Caption = L"Ajuster la sensibilité souris";
DevmodeLbl->Caption = L"Capturer le curseur dans la fenêtre / l'écran"; DevmodeLbl->Caption = L"Capturer le curseur dans la fenêtre / l'écran";
RendererLbl->Caption = L"Moteur de rendu"; RendererLbl->Caption = L"Moteur de rendu";
@ -624,7 +624,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Ripristina le impostazioni predefinite"; RestoreDefaultsBtn->Caption = L"Ripristina le impostazioni predefinite";
PresentationLbl->Caption = L"Presentazione"; PresentationLbl->Caption = L"Presentazione";
MaintasLbl->Caption = L"Mantieni il rapporto d'aspetto"; MaintasLbl->Caption = L"Mantieni il rapporto d'aspetto";
VsyncLbl->Caption = L"Abilita la sincronizzazione verticale (VSync)"; VsyncLbl->Caption = L"Abilita la sincronizzazione verticale (V-Sync)";
AdjmouseLbl->Caption = L"Regola la sensibilità del mouse"; AdjmouseLbl->Caption = L"Regola la sensibilità del mouse";
DevmodeLbl->Caption = L"Cattura il cursore nella finestra / schermo"; DevmodeLbl->Caption = L"Cattura il cursore nella finestra / schermo";
RendererLbl->Caption = L"Renderer"; RendererLbl->Caption = L"Renderer";
@ -705,7 +705,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Khôi phục cài đặt gốc"; RestoreDefaultsBtn->Caption = L"Khôi phục cài đặt gốc";
PresentationLbl->Caption = L"Chế Độ Hiển Thị"; PresentationLbl->Caption = L"Chế Độ Hiển Thị";
MaintasLbl->Caption = L"Giữ nguyên tỉ lệ khung hình"; MaintasLbl->Caption = L"Giữ nguyên tỉ lệ khung hình";
VsyncLbl->Caption = L"Bật VSync"; VsyncLbl->Caption = L"Bật V-Sync";
AdjmouseLbl->Caption = L"Điều chỉnh độ nhạy của chuột"; AdjmouseLbl->Caption = L"Điều chỉnh độ nhạy của chuột";
DevmodeLbl->Caption = L"Khóa con trỏ vào cửa sổ / màn hình"; DevmodeLbl->Caption = L"Khóa con trỏ vào cửa sổ / màn hình";
RendererLbl->Caption = L"Trình kết xuất"; RendererLbl->Caption = L"Trình kết xuất";
@ -786,7 +786,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Przywróć ustawienia domyślne"; RestoreDefaultsBtn->Caption = L"Przywróć ustawienia domyślne";
PresentationLbl->Caption = L"Tryb wyświetlania"; PresentationLbl->Caption = L"Tryb wyświetlania";
MaintasLbl->Caption = L"Zachowaj proporcje obrazu"; MaintasLbl->Caption = L"Zachowaj proporcje obrazu";
VsyncLbl->Caption = L"Włącz VSync"; VsyncLbl->Caption = L"Włącz V-Sync";
AdjmouseLbl->Caption = L"Dostosuj czułość myszy"; AdjmouseLbl->Caption = L"Dostosuj czułość myszy";
DevmodeLbl->Caption = L"Zablokuj kursor w oknie/na ekranie"; DevmodeLbl->Caption = L"Zablokuj kursor w oknie/na ekranie";
RendererLbl->Caption = L"Silnik renderowania"; RendererLbl->Caption = L"Silnik renderowania";
@ -924,7 +924,7 @@ void TConfigForm::ApplyTranslation(TIniFile *ini)
RestoreDefaultsBtn->Caption = L"Restore default settings"; RestoreDefaultsBtn->Caption = L"Restore default settings";
PresentationLbl->Caption = L"Presentation"; PresentationLbl->Caption = L"Presentation";
MaintasLbl->Caption = L"Maintain aspect ratio"; MaintasLbl->Caption = L"Maintain aspect ratio";
VsyncLbl->Caption = L"Enable VSync"; VsyncLbl->Caption = L"Enable V-Sync";
AdjmouseLbl->Caption = L"Adjust mouse sensitivity"; AdjmouseLbl->Caption = L"Adjust mouse sensitivity";
DevmodeLbl->Caption = L"Lock cursor to window / screen"; DevmodeLbl->Caption = L"Lock cursor to window / screen";
RendererLbl->Caption = L"Renderer"; RendererLbl->Caption = L"Renderer";
@ -1103,7 +1103,7 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender)
} }
MaintasChk->State = GetBool(ini, "maintas", false) ? tssOn : tssOff; MaintasChk->State = GetBool(ini, "maintas", false) ? tssOn : tssOff;
VsyncChk->State = GetBool(ini, "vsync", false) ? tssOn : tssOff; VsyncChk->State = GetBool(ini, "vsync", true) ? tssOn : tssOff;
AdjmouseChk->State = GetBool(ini, "adjmouse", true) ? tssOn : tssOff; AdjmouseChk->State = GetBool(ini, "adjmouse", true) ? tssOn : tssOff;
DevmodeChk->State = GetBool(ini, "devmode", false) ? tssOff : tssOn; DevmodeChk->State = GetBool(ini, "devmode", false) ? tssOff : tssOn;

2
config/ConfigFormUnit.dfm
View file

@ -2734,7 +2734,7 @@ object ConfigForm: TConfigForm
Width = 93 Width = 93
Height = 21 Height = 21
Margins.Top = 18 Margins.Top = 18
Caption = 'Enable VSync' Caption = 'Enable V-Sync'
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -16 Font.Height = -16

2
inc/ddraw.h
View file

@ -3193,7 +3193,7 @@ typedef struct _DDCOLORCONTROL
/* /*
* The overlay can be automatically flipped according to the video port * The overlay can be automatically flipped according to the video port
* VSYNCs, providing automatic doubled buffered display of video port * V-SYNCs, providing automatic doubled buffered display of video port
* data using an overlay * data using an overlay
*/ */
#define DDCAPS2_AUTOFLIPOVERLAY 0x00000008l #define DDCAPS2_AUTOFLIPOVERLAY 0x00000008l

10
src/config.c
View file

@ -41,7 +41,7 @@ void cfg_load()
GET_STRING("aspect_ratio", "", g_config.aspect_ratio, sizeof(g_config.aspect_ratio)); GET_STRING("aspect_ratio", "", g_config.aspect_ratio, sizeof(g_config.aspect_ratio));
GET_BOOL(g_config.boxing, "boxing", FALSE); GET_BOOL(g_config.boxing, "boxing", FALSE);
GET_INT(g_config.maxfps, "maxfps", -1); GET_INT(g_config.maxfps, "maxfps", -1);
GET_BOOL(g_config.vsync, "vsync", FALSE); GET_BOOL(g_config.vsync, "vsync", TRUE);
GET_BOOL(g_config.adjmouse, "adjmouse", TRUE); GET_BOOL(g_config.adjmouse, "adjmouse", TRUE);
GET_STRING("shader", "Shaders\\interpolation\\catmull-rom-bilinear.glsl", g_config.shader, sizeof(g_config.shader)); GET_STRING("shader", "Shaders\\interpolation\\catmull-rom-bilinear.glsl", g_config.shader, sizeof(g_config.shader));
GET_INT(g_config.window_rect.left, "posX", -32000); GET_INT(g_config.window_rect.left, "posX", -32000);
@ -213,9 +213,11 @@ static void cfg_create_ini()
"; Note: Does not have an impact on the game speed, to limit your game speed use 'maxgameticks='\n" "; Note: Does not have an impact on the game speed, to limit your game speed use 'maxgameticks='\n"
"maxfps=-1\n" "maxfps=-1\n"
"\n" "\n"
"; Vertical synchronization, enable if you get tearing - (Requires 'renderer=auto/opengl*/direct3d9*')\n" "; Vertical synchronization. Requires 'renderer=auto/opengl*/direct3d9*'.\n"
"; Note: vsync=true can fix tearing but it will cause input lag\n" "; Note: vsync=true can fix tearing but it may cause input lag\n"
"vsync=false\n" "; V-Sync is enabled for most games by default even if this setting\n"
"; is disabled because we already disable exclusive fullscreen by default\n"
"vsync=true\n"
"\n" "\n"
"; Automatic mouse sensitivity scaling\n" "; Automatic mouse sensitivity scaling\n"
"; Note: Only works if stretching is enabled. Sensitivity will be adjusted according to the size of the window\n" "; Note: Only works if stretching is enabled. Sensitivity will be adjusted according to the size of the window\n"