From 8ae9024b19e458c9362dd2a6c22f338d7990e750 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 26 Mar 2023 16:35:20 +1100 Subject: input/input_dinput.h: Work around inability to have stdcall non-capturing lambdas (fixes 32-bit MinGW build). --- src/osd/modules/input/input_dinput.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h index 991444a7cce..037c9c0c511 100644 --- a/src/osd/modules/input/input_dinput.h +++ b/src/osd/modules/input/input_dinput.h @@ -87,12 +87,16 @@ public: template HRESULT enum_attached_devices(int devclass, T &&callback) const { + struct helper + { + static BOOL CALLBACK callback(LPCDIDEVICEINSTANCE instance, LPVOID ref) + { + return (*reinterpret_cast(ref))(instance); + } + }; return m_dinput->EnumDevices( devclass, - [] (LPCDIDEVICEINSTANCE instance, LPVOID ref) -> BOOL - { - return (*reinterpret_cast(ref))(instance); - }, + &helper::callback, reinterpret_cast(&callback), DIEDFL_ATTACHEDONLY); } -- cgit v1.2.3 From f0924e31d4caeb1e874aab95f4d06f7bdc0f8c3b Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Mar 2023 03:01:04 +1100 Subject: Drop support for libc++ 6 altogether - it's missing std::unordered_map::extract. --- docs/source/initialsetup/compilingmame.rst | 5 ++++- src/emu/validity.cpp | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst index ffe9be349cd..b61b3ca6335 100644 --- a/docs/source/initialsetup/compilingmame.rst +++ b/docs/source/initialsetup/compilingmame.rst @@ -10,7 +10,10 @@ All Platforms * To compile MAME, you need a C++17 compiler and runtime library. We support building with GCC version 7.2 or later and clang version 6 or - later. MAME should run with GNU libstdc++ version 7.2 or later. + later. MAME should run with GNU libstdc++ version 7.2 or later or + libc++ version 7 or later. The initial release of any major version + of GCC should be avoided. For example, if you want to compile MAME + with GCC 10, you should use version 10.3 or later. * Whenever you are changing build parameters, (for example changing optimisation settings, or adding tools to the compile list), or system diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 9f1165efeb0..6b44a324ade 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -51,12 +51,10 @@ using test_delegate = delegate; // type //------------------------------------------------- -#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) test_delegate make_diamond_class_delegate(char (diamond_inheritance::*func)(void const *&), diamond_inheritance *obj) { return test_delegate(func, obj); } -#endif // !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) //------------------------------------------------- @@ -1488,7 +1486,6 @@ void validate_delegates_mfp() if (&o != addr) osd_printf_error("Error testing delegate this pointer adjustment for virtual member function through base class pointer %p -> %p (expected %p)\n", static_cast(static_cast(&o)), addr, static_cast(&o)); -#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) // test creating delegates for a forward-declared class cb1 = make_diamond_class_delegate(&diamond_inheritance::get_derived_a, &d); cb2 = make_diamond_class_delegate(&diamond_inheritance::get_derived_b, &d); @@ -1518,7 +1515,6 @@ void validate_delegates_mfp() if (static_cast(&d) != addr) osd_printf_error("Error testing delegate this pointer adjustment for incomplete class %p -> %p (expected %p)\n", static_cast(&d), addr, static_cast(static_cast(&d))); #endif // defined(_MSC_VER) && !defined(__clang__) -#endif // !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) } -- cgit v1.2.3 From 794a3d0ed93f26d82f7b54c2c199d9a9a9ebd84e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Mar 2023 03:15:45 +1100 Subject: amstrad/nc.cpp: Work around incomplete C++17 support in certain GCC versions. --- src/mame/amstrad/nc.cpp | 60 ++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/src/mame/amstrad/nc.cpp b/src/mame/amstrad/nc.cpp index 3af400aa8ef..5a83538db6b 100644 --- a/src/mame/amstrad/nc.cpp +++ b/src/mame/amstrad/nc.cpp @@ -41,9 +41,11 @@ ***************************************************************************/ #include "emu.h" + #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" +#include "imagedev/floppy.h" #include "machine/clock.h" #include "machine/i8251.h" #include "machine/mc146818.h" @@ -55,12 +57,13 @@ #include "machine/timer.h" #include "machine/upd765.h" #include "sound/beep.h" -#include "imagedev/floppy.h" -#include "formats/pc_dsk.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" +#include "formats/pc_dsk.h" + #define LOG_GENERAL (1U << 0) #define LOG_DEBUG (1U << 1) #define LOG_IRQ (1U << 2) @@ -93,7 +96,10 @@ public: m_uart_clock(*this, "uart_clock"), m_nvram(*this, "nvram"), m_pcmcia(*this, "pcmcia"), - m_mem_view{ {*this, "block0"}, {*this, "block1"}, {*this, "block2"}, {*this, "block3"} }, + m_mem_view0(*this, "block0"), + m_mem_view1(*this, "block1"), + m_mem_view2(*this, "block2"), + m_mem_view3(*this, "block3"), m_keyboard(*this, "line%d", 0U), m_battery(*this, "battery") { @@ -137,7 +143,10 @@ protected: required_device m_uart_clock; required_device m_nvram; required_device m_pcmcia; - memory_view m_mem_view[4]; + memory_view m_mem_view0; + memory_view m_mem_view1; + memory_view m_mem_view2; + memory_view m_mem_view3; required_ioport_array<10> m_keyboard; required_ioport m_battery; @@ -263,26 +272,26 @@ private: void nc_state::mem_map(address_map &map) { - map(0x0000, 0x3fff).view(m_mem_view[0]); - m_mem_view[0][0](0x0000, 0x3fff).bankr(m_rombank[0]); - m_mem_view[0][1](0x0000, 0x3fff).bankrw(m_rambank[0]); - m_mem_view[0][2](0x0000, 0x3fff).rw(FUNC(nc_state::pcmcia_r<0>), FUNC(nc_state::pcmcia_w<0>)); - m_mem_view[0][3](0x0000, 0x3fff).bankr(m_rombank[0]); - map(0x4000, 0x7fff).view(m_mem_view[1]); - m_mem_view[1][0](0x4000, 0x7fff).bankr(m_rombank[1]); - m_mem_view[1][1](0x4000, 0x7fff).bankrw(m_rambank[1]); - m_mem_view[1][2](0x4000, 0x7fff).rw(FUNC(nc_state::pcmcia_r<1>), FUNC(nc_state::pcmcia_w<1>)); - m_mem_view[1][3](0x4000, 0x7fff).bankr(m_rombank[1]); - map(0x8000, 0xbfff).view(m_mem_view[2]); - m_mem_view[2][0](0x8000, 0xbfff).bankr(m_rombank[2]); - m_mem_view[2][1](0x8000, 0xbfff).bankrw(m_rambank[2]); - m_mem_view[2][2](0x8000, 0xbfff).rw(FUNC(nc_state::pcmcia_r<2>), FUNC(nc_state::pcmcia_w<2>)); - m_mem_view[2][3](0x8000, 0xbfff).bankr(m_rombank[2]); - map(0xc000, 0xffff).view(m_mem_view[3]); - m_mem_view[3][0](0xc000, 0xffff).bankr(m_rombank[3]); - m_mem_view[3][1](0xc000, 0xffff).bankrw(m_rambank[3]); - m_mem_view[3][2](0xc000, 0xffff).rw(FUNC(nc_state::pcmcia_r<3>), FUNC(nc_state::pcmcia_w<3>)); - m_mem_view[3][3](0xc000, 0xffff).bankr(m_rombank[3]); + map(0x0000, 0x3fff).view(m_mem_view0); + m_mem_view0[0](0x0000, 0x3fff).bankr(m_rombank[0]); + m_mem_view0[1](0x0000, 0x3fff).bankrw(m_rambank[0]); + m_mem_view0[2](0x0000, 0x3fff).rw(FUNC(nc_state::pcmcia_r<0>), FUNC(nc_state::pcmcia_w<0>)); + m_mem_view0[3](0x0000, 0x3fff).bankr(m_rombank[0]); + map(0x4000, 0x7fff).view(m_mem_view1); + m_mem_view1[0](0x4000, 0x7fff).bankr(m_rombank[1]); + m_mem_view1[1](0x4000, 0x7fff).bankrw(m_rambank[1]); + m_mem_view1[2](0x4000, 0x7fff).rw(FUNC(nc_state::pcmcia_r<1>), FUNC(nc_state::pcmcia_w<1>)); + m_mem_view1[3](0x4000, 0x7fff).bankr(m_rombank[1]); + map(0x8000, 0xbfff).view(m_mem_view2); + m_mem_view2[0](0x8000, 0xbfff).bankr(m_rombank[2]); + m_mem_view2[1](0x8000, 0xbfff).bankrw(m_rambank[2]); + m_mem_view2[2](0x8000, 0xbfff).rw(FUNC(nc_state::pcmcia_r<2>), FUNC(nc_state::pcmcia_w<2>)); + m_mem_view2[3](0x8000, 0xbfff).bankr(m_rombank[2]); + map(0xc000, 0xffff).view(m_mem_view3); + m_mem_view3[0](0xc000, 0xffff).bankr(m_rombank[3]); + m_mem_view3[1](0xc000, 0xffff).bankrw(m_rambank[3]); + m_mem_view3[2](0xc000, 0xffff).rw(FUNC(nc_state::pcmcia_r<3>), FUNC(nc_state::pcmcia_w<3>)); + m_mem_view3[3](0xc000, 0xffff).bankr(m_rombank[3]); } void nc100_state::io_map(address_map &map) @@ -1193,7 +1202,8 @@ void nc_state::memory_management_w(offs_t offset, uint8_t data) m_mmc[offset] = data; - m_mem_view[offset].select(BIT(m_mmc[offset], 6, 2)); + memory_view *const mem_view[4] = { &m_mem_view0, &m_mem_view1, &m_mem_view2, &m_mem_view3 }; + mem_view[offset]->select(BIT(m_mmc[offset], 6, 2)); m_rombank[offset]->set_entry(m_mmc[offset] & 0x3f & (m_rom_banks - 1)); m_rambank[offset]->set_entry(m_mmc[offset] & 0x3f & (m_ram_banks - 1)); } -- cgit v1.2.3 From d2f8af5301637a78095b3032d0a60c70eb089ae0 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Mar 2023 16:39:37 +1100 Subject: emu/profiler.cpp: Disable assertion that profiler isn't enabled/disabled with profile scope active. --- src/emu/profiler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emu/profiler.cpp b/src/emu/profiler.cpp index da310b851a4..19f3908f097 100644 --- a/src/emu/profiler.cpp +++ b/src/emu/profiler.cpp @@ -91,7 +91,8 @@ real_profiler_state::real_profiler_state() void real_profiler_state::reset(bool enabled) noexcept { - assert(!m_filoptr || (m_filoptr == m_filo)); + // disabling the profiler from the UI happens while PROFILER_EXTRA is active + //assert(!m_filoptr || (m_filoptr == m_filo)); m_text_time = attotime::never; -- cgit v1.2.3 From 860cd360262c9045eea765bc9abe1d72fa8d741c Mon Sep 17 00:00:00 2001 From: David Haywood <28625134+DavidHaywood@users.noreply.github.com> Date: Mon, 27 Mar 2023 03:11:54 +0100 Subject: vastar_viddev.cpp - better sprite flip handling (#11039) --- src/mame/orca/akazukin.cpp | 1 + src/mame/orca/vastar_viddev.cpp | 19 ++++++++++++++----- src/mame/orca/vastar_viddev.h | 3 +++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/mame/orca/akazukin.cpp b/src/mame/orca/akazukin.cpp index 2c74ddedf83..42024a7f1f5 100644 --- a/src/mame/orca/akazukin.cpp +++ b/src/mame/orca/akazukin.cpp @@ -287,6 +287,7 @@ void akazukin_state::akazukin(machine_config &config) m_vasvid->set_bg0ram_tag("bg0videoram"); m_vasvid->set_bg1ram_tag("bg1videoram"); m_vasvid->set_fgram_tag("fgvideoram"); + m_vasvid->set_alt_sprite_flips(true); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/orca/vastar_viddev.cpp b/src/mame/orca/vastar_viddev.cpp index 49911883ef8..03e3c64543a 100644 --- a/src/mame/orca/vastar_viddev.cpp +++ b/src/mame/orca/vastar_viddev.cpp @@ -145,14 +145,23 @@ void vastar_video_device::draw_sprites(bitmap_rgb32& bitmap, const rectangle& cl const int sx = spriteram[m_spr_code_x + offs + 1]; int sy = spriteram[m_spr_y_col + offs]; const int color = spriteram[m_spr_y_col + offs + 1] & 0x3f; - int flipx = spriteram[m_spr_code_x + offs] & 0x02; - int flipy = spriteram[m_spr_code_x + offs] & 0x01; + bool flipy, flipx; + + if (m_alt_spriteflip) + { + flipy = (spriteram[m_spr_code_x + offs] & 0x02) ? true : false; + flipx = (spriteram[m_spr_code_x + offs] & 0x01) ? true : false; + } + else + { + flipy = (spriteram[m_spr_code_x + offs] & 0x01) ? true : false; + flipx = (spriteram[m_spr_code_x + offs] & 0x02) ? true : false; + } if (m_flip_screen) { - int temp = flipx; - flipx = !flipy; - flipy = !temp; + flipx = !flipx; + flipy = !flipy; } if (spriteram[m_spr_attr + offs] & 0x08) // double width diff --git a/src/mame/orca/vastar_viddev.h b/src/mame/orca/vastar_viddev.h index 9234ee52dde..8b599f647a5 100644 --- a/src/mame/orca/vastar_viddev.h +++ b/src/mame/orca/vastar_viddev.h @@ -31,6 +31,7 @@ public: void set_bg_bases(uint16_t code, uint16_t attr, uint16_t col) { m_bg_codebase = code; m_bg_attrbase = attr; m_bg_colbase = col; } void set_fg_bases(uint16_t code, uint16_t attr, uint16_t col) { m_fg_codebase = code; m_fg_attrbase = attr; m_fg_colbase = col; } void set_other_bases(uint16_t spy, uint16_t atr, uint16_t spx, uint16_t bgs0, uint16_t bgs1) { m_spr_y_col = spy; m_spr_attr = atr; m_spr_code_x = spx; m_bg_scroll0 = bgs0; m_bg_scroll1 = bgs1; } + void set_alt_sprite_flips(bool alt_flip) { m_alt_spriteflip = alt_flip; } template void set_bg0ram_tag(T &&... args) { m_bgvideoram[0].set_tag(std::forward(args)...); } template void set_bg1ram_tag(T &&... args) { m_bgvideoram[1].set_tag(std::forward(args)...); } @@ -88,6 +89,8 @@ private: uint16_t m_bg_scroll0 = 0; uint16_t m_bg_scroll1 = 0; + bool m_alt_spriteflip = false; + TILE_GET_INFO_MEMBER(get_fg_tile_info); template TILE_GET_INFO_MEMBER(get_bg_tile_info); -- cgit v1.2.3 From 6eee46c147a503ee0e92dba3ed9728703e039d1f Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sun, 26 Mar 2023 20:44:24 +0200 Subject: sega/system16.cpp: fixed typo in ROM definition (cherry picked from commit 07313d507de15156c1748ee472064245f2428d94) --- src/mame/sega/system16.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/sega/system16.cpp b/src/mame/sega/system16.cpp index fae49799915..95765f93278 100644 --- a/src/mame/sega/system16.cpp +++ b/src/mame/sega/system16.cpp @@ -3745,7 +3745,7 @@ ROM_START( bloxeedbl ) ROM_LOAD( "21.ic2", 0x00000, 0x20000, CRC(daf5bb20) SHA1(99e04672a9785a143b0d472e276673b6d323fd2b) ) // ds40986 (27c010) ROM_LOAD( "22.ic3", 0x20000, 0x20000, CRC(16f5668e) SHA1(adb2c3a5ae40627e6110db531427a4f15211ab9b) ) // ds40986 (27c010) ROM_LOAD( "23.ic4", 0x40000, 0x20000, CRC(2b2c3d8b) SHA1(543f622e7139c22bc491583cbb276acfc827b5d0) ) // ds40986 (27c010) - ROM_LOAD(" 24.ic5", 0x60000, 0x20000, CRC(107b141b) SHA1(e3fe19b4c7ba8ff60638df17dc4ae50f42a6b024) ) // ds40986 (27c010) + ROM_LOAD( "24.ic5", 0x60000, 0x20000, CRC(107b141b) SHA1(e3fe19b4c7ba8ff60638df17dc4ae50f42a6b024) ) // ds40986 (27c010) ROM_REGION( 0x100000, "proms", 0 ) ROM_LOAD( "82s129.ic32", 0x000, 0x0100, CRC(b921d13f) SHA1(d9d8a1571d974fd512e66097d5d83dd69035cbcb) ) -- cgit v1.2.3 From 8ddd9f6c490ffd411a0b3a3be79239c0189ca20b Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 27 Mar 2023 15:11:07 +0200 Subject: shuuz: fix trackball regression (cherry picked from commit 988951dac329c84a39c1734e03bf368fe5634686) --- src/mame/atari/shuuz.cpp | 2 +- src/mame/omron/luna_88k.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mame/atari/shuuz.cpp b/src/mame/atari/shuuz.cpp index 15f8edf5e6f..467c2430fa3 100644 --- a/src/mame/atari/shuuz.cpp +++ b/src/mame/atari/shuuz.cpp @@ -232,7 +232,7 @@ uint16_t shuuz_state::leta_r(offs_t offset) if (which == 0) { int const dx = (int8_t)m_track[0]->read(); - int const dy = (int8_t)m_track[0]->read(); + int const dy = (int8_t)m_track[1]->read(); m_cur[0] = dx + dy; m_cur[1] = dx - dy; diff --git a/src/mame/omron/luna_88k.cpp b/src/mame/omron/luna_88k.cpp index e7d3c889b89..23a0e534f40 100644 --- a/src/mame/omron/luna_88k.cpp +++ b/src/mame/omron/luna_88k.cpp @@ -695,5 +695,5 @@ ROM_END } // anonymous namespace -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -COMP(1992?, luna88k2, 0, 0, luna88k2, luna88k, luna_88k_state, init, "Omron", "Luna 88K²", MACHINE_IS_SKELETON) +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +COMP(1992?, luna88k2, 0, 0, luna88k2, luna88k, luna_88k_state, init, "Omron", u8"Luna 88K²", MACHINE_IS_SKELETON) -- cgit v1.2.3 From 79ee6b4556178d1edd9f219b6c82444166d1dc61 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 28 Mar 2023 03:36:16 +1100 Subject: hash/svision.xml: Cleaned up descriptions. --- hash/svision.xml | 96 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/hash/svision.xml b/hash/svision.xml index bbbd8468131..e7e99108b9b 100644 --- a/hash/svision.xml +++ b/hash/svision.xml @@ -17,7 +17,7 @@ license:CC0-1.0 - 2 in 1 - Block Buster + Cross High (Euro, USA) + 2 in 1 - Block Buster + Cross High (Europe, USA) 199? Supervision @@ -30,7 +30,7 @@ license:CC0-1.0 - 2 in 1 - Hash Blocks + Eagle Plan (Euro, USA) + 2 in 1 - Hash Blocks + Eagle Plan (Europe, USA) 1992 GTC Inc @@ -43,7 +43,7 @@ license:CC0-1.0 - Alien (Euro, USA) + Alien (Europe, USA) 199? Supervision @@ -56,7 +56,7 @@ license:CC0-1.0 - Balloon Fight (Euro, USA) + Balloon Fight (Europe, USA) 199? Watara @@ -67,7 +67,7 @@ license:CC0-1.0 - Block Buster (Euro, USA) + Block Buster (Europe, USA) 199? Supervision @@ -80,7 +80,7 @@ license:CC0-1.0 - Brain Power (Euro, USA) + Brain Power (Europe, USA) 199? Supervision @@ -104,7 +104,7 @@ license:CC0-1.0 - Carrier (Euro, USA) + Carrier (Europe, USA) 199? Travellmate @@ -117,7 +117,7 @@ license:CC0-1.0 - Cave Wonders (Euro, USA) + Cave Wonders (Europe, USA) 1992 Bon Treasure @@ -128,7 +128,7 @@ license:CC0-1.0 - Challenger Tank (Euro, USA) + Challenger Tank (Europe, USA) 199? Watara @@ -141,7 +141,7 @@ license:CC0-1.0 - Chimera (Euro, USA) + Chimera (Europe, USA) 199? Supervision @@ -189,7 +189,7 @@ license:CC0-1.0 - Cross High (Euro, USA) + Cross High (Europe, USA) 1991 GTC Inc @@ -200,7 +200,7 @@ license:CC0-1.0 - Crystball (Euro, USA) + Crystball (Europe, USA) 1991 Travellmate @@ -211,7 +211,7 @@ license:CC0-1.0 - Crystball (Euro, USA, earlier) + Crystball (Europe, USA, earlier) 1991 Travellmate @@ -235,7 +235,7 @@ license:CC0-1.0 - Delta Hero (Euro, USA) + Delta Hero (Europe, USA) 1992 Bon Treasure @@ -259,7 +259,7 @@ license:CC0-1.0 - Eagle Plan (Euro, USA) + Eagle Plan (Europe, USA) 1992 GTC Inc @@ -272,7 +272,7 @@ license:CC0-1.0 - Earth Defender (Euro, USA) + Earth Defender (Europe, USA) 1992 Bon Treasure @@ -283,7 +283,7 @@ license:CC0-1.0 - Fatal Craft (Euro, USA) + Fatal Craft (Europe, USA) 1992 Bon Treasure @@ -294,7 +294,7 @@ license:CC0-1.0 - Final Combat (Euro, USA) + Final Combat (Europe, USA) 199? Watara @@ -305,7 +305,7 @@ license:CC0-1.0 - Final Combat (Alt) + Final Combat (alt) 1992 Thin Chen Enterprise @@ -318,7 +318,7 @@ license:CC0-1.0 - Galactic Crusader (Euro, USA) + Galactic Crusader (Europe, USA) 199? Watara @@ -331,7 +331,7 @@ license:CC0-1.0 - Galaxy Fighter (Euro, USA) + Galaxy Fighter (Europe, USA) 1992 Thin Chen Enterprise @@ -342,7 +342,7 @@ license:CC0-1.0 - Grand Prix (Euro, USA) + Grand Prix (Europe, USA) 1992 Bon Treasure @@ -355,7 +355,7 @@ license:CC0-1.0 - Happy Pairs (Euro, USA) + Happy Pairs (Europe, USA) 1992 Sachen @@ -381,7 +381,7 @@ license:CC0-1.0 - Hash Blocks (Euro, USA) + Hash Blocks (Europe, USA) 1991 GTC Inc @@ -405,7 +405,7 @@ license:CC0-1.0 - Hero Kid (Euro, USA) + Hero Kid (Europe, USA) 1992 Hartung @@ -418,7 +418,7 @@ license:CC0-1.0 - Honey Bee (Euro, USA) + Honey Bee (Europe, USA) 199? Watara @@ -431,7 +431,7 @@ license:CC0-1.0 - Jacky Lucky (Euro, USA) + Jacky Lucky (Europe, USA) 1992 Bon Treasure @@ -442,7 +442,7 @@ license:CC0-1.0 - Jaguar Bomber (Euro, USA) + Jaguar Bomber (Europe, USA) 1992 Bon Treasure @@ -455,7 +455,7 @@ license:CC0-1.0 - John Adventure (Euro, USA) + John Adventure (Europe, USA) 199? Watara @@ -468,7 +468,7 @@ license:CC0-1.0 - Juggler (Euro, USA) + Juggler (Europe, USA) 1992 Bon Treasure @@ -481,7 +481,7 @@ license:CC0-1.0 - Kabi Island - Gold in Island (Euro, USA) + Kabi Island - Gold in Island (Europe, USA) 199? Watara @@ -514,7 +514,7 @@ license:CC0-1.0 - Linear Racing (Euro, USA) + Linear Racing (Europe, USA) 199? Watara @@ -527,7 +527,7 @@ license:CC0-1.0 - Magincross (Euro, USA) + Magincross (Europe, USA) 1992 Thin Chen Enterprise @@ -554,7 +554,7 @@ license:CC0-1.0 - Matta Blatta (Euro, USA) + Matta Blatta (Europe, USA) 199? Watara @@ -567,7 +567,7 @@ license:CC0-1.0 - Olympic Trials (Euro, USA) + Olympic Trials (Europe, USA) 1992 Watara @@ -580,7 +580,7 @@ license:CC0-1.0 - P-52 Sea Battle (Euro, USA) + P-52 Sea Battle (Europe, USA) 199? Watara @@ -593,7 +593,7 @@ license:CC0-1.0 - PacBoy & Mouse (Euro, USA) + PacBoy & Mouse (Europe, USA) 199? Watara @@ -617,7 +617,7 @@ license:CC0-1.0 - Penguin Hideout (Euro, USA) + Penguin Hideout (Europe, USA) 1992 Thin Chen Enterprise @@ -630,7 +630,7 @@ license:CC0-1.0 - Police Bust (Euro, USA) + Police Bust (Europe, USA) 199? Bon Treasure @@ -656,7 +656,7 @@ license:CC0-1.0 - Pyramid (Euro, USA) + Pyramid (Europe, USA) 199? Watara @@ -691,7 +691,7 @@ license:CC0-1.0 - Soccer Champion (Euro, USA) + Soccer Champion (Europe, USA) 199? Hartung @@ -728,7 +728,7 @@ license:CC0-1.0 - SSSnake (Euro, USA) + SSSnake (Europe, USA) 199? Watara @@ -741,7 +741,7 @@ license:CC0-1.0 - Super Block (Euro, USA) + Super Block (Europe, USA) 1992 Bon Treasure @@ -754,7 +754,7 @@ license:CC0-1.0 - Super Kong (Euro, USA) + Super Kong (Europe, USA) 1992 Thin Chen Enterprise @@ -780,7 +780,7 @@ license:CC0-1.0 - Tasac 2010 (Euro, USA) + Tasac 2010 (Europe, USA) 1992 Thin Chen Enterprise @@ -793,7 +793,7 @@ license:CC0-1.0 - Tennis Pro '92 (Euro, USA) + Tennis Pro '92 (Europe, USA) 1992 B.I.T.S. @@ -817,7 +817,7 @@ license:CC0-1.0 - Treasure Hunter (Euro, USA, 1993) + Treasure Hunter (Europe, USA, 1993) 1993 Watara @@ -828,7 +828,7 @@ license:CC0-1.0 - Treasure Hunter (Euro, USA, 1992) + Treasure Hunter (Europe, USA, 1992) 1992 Watara -- cgit v1.2.3 From e2dca442742b73033fe4a537d195290ae44a289e Mon Sep 17 00:00:00 2001 From: ArcadeShadow Date: Mon, 27 Mar 2023 07:05:41 +0100 Subject: camplynx_cass.xml: Replaced abbreviated country names. (#11034) --- hash/camplynx_cass.xml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/hash/camplynx_cass.xml b/hash/camplynx_cass.xml index c560a238358..42019ec081c 100644 --- a/hash/camplynx_cass.xml +++ b/hash/camplynx_cass.xml @@ -264,7 +264,7 @@ license:CC0-1.0 - Labyrinthe (Fra) + Labyrinthe (France) 1983 Quazar Computing @@ -301,7 +301,7 @@ license:CC0-1.0 - Mastermind (96K)(Fra) + Mastermind (96K)(France) 198? Willowsoft @@ -337,7 +337,7 @@ license:CC0-1.0 - Moonfall (Fra) + Moonfall (France) 1983 Camsoft @@ -386,7 +386,7 @@ license:CC0-1.0 - Numerons (Fra) + Numerons (France) 1983 Camsoft @@ -411,7 +411,7 @@ license:CC0-1.0 - L'odyssée d'Astérix (96K)(Fra) + L'odyssée d'Astérix (96K)(France) 198? La Bibliothèque de Cintre @@ -509,7 +509,7 @@ license:CC0-1.0 - ScrabLynx (96K)(Fra) + ScrabLynx (96K)(France) 1985 <unknown> @@ -597,7 +597,7 @@ license:CC0-1.0 - The Worm (96K)(Fra) + The Worm (96K)(France) 1983 Quazar Computing @@ -622,7 +622,7 @@ license:CC0-1.0 - Zombie Panic (Fra) + Zombie Panic (France) 1983 Bus-Tech @@ -637,7 +637,7 @@ license:CC0-1.0 - Aide (Label-Procedures) (Fra) + Aide (Label-Procedures) (France) 198? <unknown> @@ -693,7 +693,7 @@ license:CC0-1.0 - Disassembler (Fra) + Disassembler (France) 198? <unknown> @@ -705,7 +705,7 @@ license:CC0-1.0 - Lynx Disassembler (Fra) + Lynx Disassembler (France) 1983 Camsoft @@ -717,7 +717,7 @@ license:CC0-1.0 - Générateur Basic (Fra) + Générateur Basic (France) 1984 L'oeil de Lynx @@ -730,7 +730,7 @@ license:CC0-1.0 - Générateur de Caracteres (96K)(Fra) + Générateur de Caracteres (96K)(France) 1984 L'oeil de Lynx @@ -754,7 +754,7 @@ license:CC0-1.0 - Maths (Fra) + Maths (France) 198? <unknown> @@ -810,7 +810,7 @@ license:CC0-1.0 - Chopin (Fra) + Chopin (France) 1984 Tout Savoir sur Lynx @@ -855,7 +855,7 @@ license:CC0-1.0 - Grid Trap (Fra) + Grid Trap (France) 1984 L'oeil de Lynx @@ -881,7 +881,7 @@ license:CC0-1.0 - IntelTab (96K)(Fra) + IntelTab (96K)(France) 1984 <unknown> @@ -894,7 +894,7 @@ license:CC0-1.0 - Maxi-Mots (96K)(Fra) + Maxi-Mots (96K)(France) 1984 L'oeil de Lynx @@ -976,7 +976,7 @@ license:CC0-1.0 - Tron Blocker (96K)(Fra) + Tron Blocker (96K)(France) 1984 NiLUG News -- cgit v1.2.3