diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 765e2a0788be6..37320df98a98c 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index c498499145f18..63dd0bfed6a07 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '0.267' +version = '0.268' # The full version, including alpha/beta/rc tags. -release = '0.267' +release = '0.268' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hash/fp1100_cass.xml b/hash/fp1100_cass.xml index 7d013f63be444..3e8e0efe8c94f 100644 --- a/hash/fp1100_cass.xml +++ b/hash/fp1100_cass.xml @@ -10,7 +10,7 @@ TODO: --> - Alien No Gyakushu + Alien no Gyakushū 1983? Compac @@ -37,7 +37,7 @@ RUN WIDTH 40 LOADM "CAS0:",R ]]> - + diff --git a/makefile b/makefile index 599df7935dad7..7af7a7c8020e1 100644 --- a/makefile +++ b/makefile @@ -1578,7 +1578,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.267"' > $@ + @echo '#define BARE_BUILD_VERSION "0.268"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.267" > $@ + @echo #define BARE_BUILD_VERSION "0.268" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index ee823f12d8ecb..db16681e24729 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -1918,7 +1918,11 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey) if (exclusive_input_pressed(iptkey, IPT_UI_CANCEL, 0)) { - if (!m_search.empty()) + if (m_ui_error) + { + // dismiss error + } + else if (!m_search.empty()) { // escape pressed with non-empty search text clears it m_search.clear(); @@ -1940,7 +1944,12 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey) // accept left/right keys as-is with repeat if (exclusive_input_pressed(iptkey, IPT_UI_LEFT, (flags & PROCESS_LR_REPEAT) ? 6 : 0)) { - if (m_focus == focused_menu::RIGHTTOP) + if (m_ui_error) + { + // dismiss error + return false; + } + else if (m_focus == focused_menu::RIGHTTOP) { // Swap the right panel and swallow it iptkey = IPT_INVALID; @@ -1971,7 +1980,12 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey) // swallow left/right keys if they are not appropriate if (exclusive_input_pressed(iptkey, IPT_UI_RIGHT, (flags & PROCESS_LR_REPEAT) ? 6 : 0)) { - if (m_focus == focused_menu::RIGHTTOP) + if (m_ui_error) + { + // dismiss error + return false; + } + else if (m_focus == focused_menu::RIGHTTOP) { // Swap the right panel and swallow it iptkey = IPT_INVALID; diff --git a/src/mame/heathzenith/h8.cpp b/src/mame/heathzenith/h8.cpp index 25aea75c1d0e8..243fe3d279f05 100644 --- a/src/mame/heathzenith/h8.cpp +++ b/src/mame/heathzenith/h8.cpp @@ -454,5 +454,5 @@ ROM_END /* Driver */ -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS, INIT COMPANY FULLNAME FLAGS */ +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS, INIT COMPANY FULLNAME FLAGS COMP( 1977, h8, 0, 0, h8, h8, h8_state, empty_init, "Heath Company", "Heathkit H8 Digital Computer", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/igs/igs009.cpp b/src/mame/igs/igs009.cpp index f1fd46e304b7b..14892ed72d0b6 100644 --- a/src/mame/igs/igs009.cpp +++ b/src/mame/igs/igs009.cpp @@ -816,7 +816,7 @@ void igs009_state::gp98(machine_config &config) Original IGS. For amusement. */ -ROM_START( jingbell ) +ROM_START( jbell157us ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "27c512_v157_us.u44", 0x00000, 0x10000, CRC(37f95b60) SHA1(db2022802ce553ce7a0e8403408f3194b2f10007) ) @@ -841,7 +841,7 @@ ROM_END Original IGS. For amusement. */ -ROM_START( jingbella ) +ROM_START( jbell155ue ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "27c512_v155.u44", 0x00000, 0x10000, CRC(0813d12b) SHA1(4c35b656d1e54619bbfd26cbc017eba336e6abda) ) @@ -866,7 +866,7 @@ ROM_END Original IGS. For amusement. */ -ROM_START( jingbellb ) +ROM_START( jbell153ue ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "27c512_v153.u44", 0x00000, 0x10000, CRC(fd3bc092) SHA1(a92dc9bc15d7a4816887d66d46cea925d230c5b8) ) @@ -891,7 +891,7 @@ ROM_END Original IGS. For amusement. */ -ROM_START( jingbellc ) +ROM_START( jbell141ue ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "27c512_v141.u44", 0x00000, 0x10000, CRC(6997a903) SHA1(991508d85e55a3c6f811070352e06ae6bf65cc2e) ) @@ -949,7 +949,7 @@ Italy, V133I ***************************************************************************/ -ROM_START( jingbelli ) +ROM_START( jbell133i ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "jinglev133i.u44", 0x00000, 0x10000, CRC(df60dc39) SHA1(ff57afd50c045b621395353fdc50ffd1e1b65e9e) ) @@ -1149,12 +1149,12 @@ ROM_END } // anonymous namespace -// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS -GAME( 1997, jingbell, 0, jingbell, jingbell, igs009_state, init_jingbell, ROT0, "IGS", "Jingle Bell (US, V157US)", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, jingbella, jingbell, jingbell, jingbell, igs009_state, init_jingbell, ROT0, "IGS", "Jingle Bell (EU, V155UE)", MACHINE_SUPPORTS_SAVE ) // Shows V154UE in test mode! -GAME( 1997, jingbellb, jingbell, jingbell, jingbell, igs009_state, init_jingbell, ROT0, "IGS", "Jingle Bell (EU, V153UE)", MACHINE_SUPPORTS_SAVE ) -GAME( 1995, jingbellc, jingbell, jingbell, jingbell, igs009_state, init_jingbelli, ROT0, "IGS", "Jingle Bell (EU, V141UE)", MACHINE_SUPPORTS_SAVE ) -GAME( 1995?, jingbelli, jingbell, jingbell, jingbell, igs009_state, init_jingbelli, ROT0, "IGS", "Jingle Bell (Italy, V133I)", MACHINE_SUPPORTS_SAVE ) -GAME( 1995?, animalhjb, jingbell, jingbell, jingbell, igs009_state, init_animalhjb, ROT0, "bootleg", "Animal House (bootleg of Jingle Bell)", MACHINE_SUPPORTS_SAVE ) -GAME( 1998, gp98, 0, gp98, jingbell, igs009_state, empty_init, ROT0, "Romtec Co. Ltd", "Grand Prix '98 (V100K, set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1998, gp98a, gp98, gp98, jingbell, igs009_state, empty_init, ROT0, "Romtec Co. Ltd", "Grand Prix '98 (V100K, set 2)", MACHINE_SUPPORTS_SAVE ) // "V100K JINGLEBELL" string on program ROM +// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS +GAME( 1997, jbell157us, jbell, jingbell, jingbell, igs009_state, init_jingbell, ROT0, "IGS", "Jingle Bell (US, V157US)", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, jbell155ue, jbell, jingbell, jingbell, igs009_state, init_jingbell, ROT0, "IGS", "Jingle Bell (EU, V155UE)", MACHINE_SUPPORTS_SAVE ) // Shows V154UE in test mode! +GAME( 1997, jbell153ue, jbell, jingbell, jingbell, igs009_state, init_jingbell, ROT0, "IGS", "Jingle Bell (EU, V153UE)", MACHINE_SUPPORTS_SAVE ) +GAME( 1995, jbell141ue, jbell, jingbell, jingbell, igs009_state, init_jingbelli, ROT0, "IGS", "Jingle Bell (EU, V141UE)", MACHINE_SUPPORTS_SAVE ) +GAME( 1995?, jbell133i, jbell, jingbell, jingbell, igs009_state, init_jingbelli, ROT0, "IGS", "Jingle Bell (Italy, V133I)", MACHINE_SUPPORTS_SAVE ) +GAME( 1995?, animalhjb, jbell, jingbell, jingbell, igs009_state, init_animalhjb, ROT0, "bootleg", "Animal House (bootleg of Jingle Bell)", MACHINE_SUPPORTS_SAVE ) +GAME( 1998, gp98, 0, gp98, jingbell, igs009_state, empty_init, ROT0, "Romtec Co. Ltd", "Grand Prix '98 (V100K, set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1998, gp98a, gp98, gp98, jingbell, igs009_state, empty_init, ROT0, "Romtec Co. Ltd", "Grand Prix '98 (V100K, set 2)", MACHINE_SUPPORTS_SAVE ) // "V100K JINGLEBELL" string on program ROM diff --git a/src/mame/igs/spoker.cpp b/src/mame/igs/spoker.cpp index c30ca99507894..e8a4da614331e 100644 --- a/src/mame/igs/spoker.cpp +++ b/src/mame/igs/spoker.cpp @@ -1239,7 +1239,7 @@ ROM_START( spk100 ) // no labels on the ROMs ROM_LOAD( "u38", 0x0000, 0x40000, CRC(33e6089d) SHA1(cd1ad01e92c18bbeab3fe3ea9152f8b0a3eb1b29) ) ROM_END -ROM_START( jb200us ) // IGS PCB-0308-01, same as the US Super Poker sets +ROM_START( jbell ) // IGS PCB-0308-01, same as the US Super Poker sets ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD( "jingle_v200us.u27", 0x00000, 0x10000, CRC(831782cb) SHA1(8e903569a0cd34222a7e5fd3e9ab21bf00802bb3) ) // 27C512 ROM_LOAD( "jingle_v200us_7.u26", 0x10000, 0x10000, CRC(3160f443) SHA1(2930359961a618cbe356a7f9c8fd63bacba2a6b0) ) // 27C512, 1ST AND 2ND HALF IDENTICAL @@ -1501,4 +1501,4 @@ GAME( 1993?, spk114it, spk306us, spoker, spk114it, spoker_state, init_spk11 GAME( 1996, spk102ua, spk306us, spokeru, spoker, spokeru_state, init_spokeru, ROT0, "IGS", "Super Poker (v102UA)", MACHINE_SUPPORTS_SAVE ) GAME( 1996, spk100, spk306us, spoker, spk114it, spoker_state, init_spk100, ROT0, "IGS", "Super Poker (v100)", MACHINE_SUPPORTS_SAVE ) GAME( 1993?, 3super8, 0, _3super8, 3super8, spoker_state, init_3super8, ROT0, "", "3 Super 8 (Italy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) //roms are badly dumped -GAME( 1997, jb200us, 0, jb, jb, jb_state, init_spokeru, ROT0, "IGS", "Jingle Bell (v200US)", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, jbell, 0, jb, jb, jb_state, init_spokeru, ROT0, "IGS", "Jingle Bell (v200US)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/layout/h8.lay b/src/mame/layout/h8.lay index b571a4cc4b522..7938c80a790a5 100644 --- a/src/mame/layout/h8.lay +++ b/src/mame/layout/h8.lay @@ -179,124 +179,98 @@ license:CC0-1.0 - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + + + + + - - + + + - + - + - + - + - + - + - + - - - - - - - + - - - - - + + + + - + - - + - + - - - - - - - - + - + - + diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 618ddbea8550a..c45032f866890 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -20149,11 +20149,11 @@ wcherry // bootleg animalhjb // bootleg gp98 // (c) 1998 gp98a // (c) 1998 -jingbell // (c) 1997 -jingbella // (c) 1997 -jingbellb // (c) 1997 -jingbellc // (c) 1995 -jingbelli // (c) 1995? +jbell133i // (c) 1995? +jbell141ue // (c) 1995 +jbell153ue // (c) 1997 +jbell155ue // (c) 1997 +jbell157us // (c) 1997 @source:igs/igs011.cpp dbc // (c) 199? @@ -20476,7 +20476,7 @@ kov3hd101 @source:igs/spoker.cpp 3super8 // unknown -jb200us // (c) 1997 IGS +jbell // (c) 1997 IGS spk100 // (c) 1996 IGS spk102ua // (c) 1996 IGS spk114it // (c) 199? IGS diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index dba5d18b9ac21..ac4540bd6388c 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -463,8 +463,9 @@ void MainWindow::debugActClose() void MainWindow::debuggerExit() { + // this isn't called from a Qt event loop, so close() will leak the window object m_exiting = true; - close(); + delete this; } diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp index 783c5a2439332..cd0998fab862a 100644 --- a/src/osd/modules/debugger/qt/windowqt.cpp +++ b/src/osd/modules/debugger/qt/windowqt.cpp @@ -251,7 +251,8 @@ void WindowQt::debugActQuit() void WindowQt::debuggerExit() { - close(); + // this isn't called from a Qt event loop, so close() will leak the window object + delete this; }