mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 17:15:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2025-10-26 17:42:21 +01:00
parent f4f050d14e 3b43627f38
commit e63af45ce9
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.c
View File

@@ -339,6 +339,7 @@ load_machine(void)
{ .old = "infinia7200", .new = "tc430hx", .new_bios = "infinia7200" },
{ .old = "dellvenus", .new = "vs440fx", .new_bios = "dellvenus" },
{ .old = "gw2kvenus", .new = "vs440fx", .new_bios = "gw2kvenus" },
{ .old = "lgibmx7g", .new = "ms6119", .new_bios = "lgibmx7g" },
{ 0 }
};

18
src/mem/rom.c
View File

@@ -643,27 +643,27 @@ bios_load(const char *fn1, const char *fn2, uint32_t addr, int sz, int off, int
int
bios_load_linear_combined(const char *fn1, const char *fn2, int sz, UNUSED(int off))
{
return bios_load_linear(fn1, 0x000f0000, 131072, 128) && \
return bios_load_linear(fn1, 0x000f0000, 131072, 128) &&
bios_load_aux_linear(fn2, 0x000e0000, sz - 65536, 128);
}
int
bios_load_linear_combined2(const char *fn1, const char *fn2, const char *fn3, const char *fn4, const char *fn5, int sz, int off)
{
return bios_load_linear(fn3, 0x000f0000, 262144, off) && \
bios_load_aux_linear(fn1, 0x000d0000, 65536, off) && \
bios_load_aux_linear(fn2, 0x000c0000, 65536, off) && \
bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off) && \
return bios_load_linear(fn3, 0x000f0000, 262144, off) &&
bios_load_aux_linear(fn1, 0x000d0000, 65536, off) &&
bios_load_aux_linear(fn2, 0x000c0000, 65536, off) &&
bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off) &&
(!fn5 || bios_load_aux_linear(fn5, 0x000ec000, 16384, 0));
}
int
bios_load_linear_combined2_ex(const char *fn1, const char *fn2, const char *fn3, const char *fn4, const char *fn5, int sz, int off)
{
return bios_load_linear(fn3, 0x000e0000, 262144, off) && \
bios_load_aux_linear(fn1, 0x000c0000, 65536, off) && \
bios_load_aux_linear(fn2, 0x000d0000, 65536, off) && \
bios_load_aux_linear(fn4, 0x000f0000, sz - 196608, off) && \
return bios_load_linear(fn3, 0x000e0000, 262144, off) &&
bios_load_aux_linear(fn1, 0x000c0000, 65536, off) &&
bios_load_aux_linear(fn2, 0x000d0000, 65536, off) &&
bios_load_aux_linear(fn4, 0x000f0000, sz - 196608, off) &&
(!fn5 || bios_load_aux_linear(fn5, 0x000fc000, 16384, 0));
}

24
src/qt/languages/cs-CZ.po
View File

@@ -850,10 +850,10 @@ msgid "Invalid PCap device"
msgstr "Neplatné PCap zařízení"
msgid "Generic paddle controller(s)"
msgstr "Obecný ovladač pádla"
msgstr "Obecný otočný ovladač"
msgid "2-axis, 1-button joystick(s)"
msgstr "Joystick s 2 osami a 1 tlačítky"
msgstr "Joystick s 2 osami a 1 tlačítkem"
msgid "2-axis, 2-button joystick(s)"
msgstr "Joystick s 2 osami a 2 tlačítky"
@@ -880,19 +880,19 @@ msgid "3-axis, 4-button joystick"
msgstr "Joystick s 3 osami a 4 tlačítky"
msgid "4-axis, 2-button joystick"
msgstr "Joystick s 4 osami a 2 tlačítky"
msgstr "Joystick se 4 osami a 2 tlačítky"
msgid "4-axis, 3-button joystick"
msgstr "Joystick s 4 osami a 3 tlačítky"
msgstr "Joystick se 4 osami a 3 tlačítky"
msgid "4-axis, 4-button joystick"
msgstr "Joystick s 4 osami a 4 tlačítky"
msgstr "Joystick se 4 osami a 4 tlačítky"
msgid "2-button gamepad(s)"
msgstr "Ovladač se 2 tlačítky"
msgstr "Ovladač s 2 tlačítky"
msgid "3-button gamepad"
msgstr "Ovladač se 3 tlačítky"
msgstr "Ovladač s 3 tlačítky"
msgid "4-button gamepad"
msgstr "Ovladač se 4 tlačítky"
@@ -904,10 +904,10 @@ msgid "Gravis PC GamePad"
msgstr "Gravis PC GamePad"
msgid "2-button flight yoke"
msgstr "Letecký knipl se 2 tlačítky"
msgstr "Letecký knipl s 2 tlačítky"
msgid "3-button flight yoke"
msgstr "Letecký knipl se32 tlačítky"
msgstr "Letecký knipl s 3 tlačítky"
msgid "4-button flight yoke"
msgstr "Letecký knipl se 4 tlačítky"
@@ -919,7 +919,7 @@ msgid "3-button flight yoke with throttle"
msgstr "Letecký knipl s 3 tlačítky a pákou"
msgid "4-button flight yoke with throttle"
msgstr "Letecký knipl s 4 tlačítky a pákou"
msgstr "Letecký knipl se 4 tlačítky a pákou"
msgid "Steering wheel (3-axis, 2-button)"
msgstr "Volant (3 osy, 2 tlačítka)"
@@ -1852,10 +1852,10 @@ msgid "Adapter:"
msgstr "Adaptér:"
msgid "VDE Socket:"
msgstr "Zásuvka VDE:"
msgstr "VDE socket:"
msgid "TAP Bridge Device:"
msgstr ""
msgstr "Zařízení TAP mostu:"
msgid "86Box Unit Tester"
msgstr "86Box Unit Tester"