Merge tag 'mame0268' into HEAD

MAME 0.268

android-project/app/src/main/AndroidManifest.xml

@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="267"
-      android:versionName="0.267"
+      android:versionCode="268"
+      android:versionName="0.268"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

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.

hash/fp1100_cass.xml

@@ -10,7 +10,7 @@ TODO:
 -->
 <softwarelist name="fp1100_cass" description="Casio FP-1100 cassettes">
 	<software name="aliengya" supported="no">
-		<description>Alien No Gyakushu</description>
+		<description>Alien no Gyakushū</description>
 		<year>1983?</year>
 		<publisher>Compac</publisher>
 		<!-- TODO: Denoting wrong snippet -->
@@ -37,7 +37,7 @@ RUN
 WIDTH 40
 LOADM "CAS0:",R
 ]]></notes>
-		<info name="alt_title" value="アタックシーモンスタ"/>
+		<info name="alt_title" value="アタックシーモンスター"/>
 		<info name="serial" value="C-1001"/>
 		<part name="cass1" interface="fp1100_cass">
 			<dataarea name="cass" size="6191452">

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[]; >> $@

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;

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 )

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

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,  "<unknown>", "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 )

src/mame/layout/h8.lay

@@ -179,124 +179,98 @@ license:CC0-1.0
 	</element>
 
 	<group name="keypad">
-		<bounds x="0" y="0" width="4.35" height="4.275" />
+		<element ref="background">
+			<bounds x="0" y="0" width="4.4" height="4.4" />
+		</element>
 
-		<element ref="btn_7" inputtag="X0" inputmask="0x80"><bounds x="0.20" y="0.125" width="1.0" height="1.0" /></element>
-		<element ref="btn_8" inputtag="X1" inputmask="0x01"><bounds x="1.25" y="0.125" width="1.0" height="1.0" /></element>
-		<element ref="btn_9" inputtag="X1" inputmask="0x02"><bounds x="2.30" y="0.125" width="1.0" height="1.0" /></element>
-		<element ref="btn_a" inputtag="X1" inputmask="0x04"><bounds x="3.35" y="0.125" width="1.0" height="1.0" /></element>
+		<element ref="btn_7" inputtag="X0" inputmask="0x80"><bounds x="0.125" y="0.125" width="1.0" height="1.0" /></element>
+		<element ref="btn_8" inputtag="X1" inputmask="0x01"><bounds x="1.175" y="0.125" width="1.0" height="1.0" /></element>
+		<element ref="btn_9" inputtag="X1" inputmask="0x02"><bounds x="2.225" y="0.125" width="1.0" height="1.0" /></element>
+		<element ref="btn_a" inputtag="X1" inputmask="0x04"><bounds x="3.275" y="0.125" width="1.0" height="1.0" /></element>
 
-		<element ref="btn_4" inputtag="X0" inputmask="0x10"><bounds x="0.20" y="1.175" width="1.0" height="1.0" /></element>
-		<element ref="btn_5" inputtag="X0" inputmask="0x20"><bounds x="1.25" y="1.175" width="1.0" height="1.0" /></element>
-		<element ref="btn_6" inputtag="X0" inputmask="0x40"><bounds x="2.30" y="1.175" width="1.0" height="1.0" /></element>
-		<element ref="btn_b" inputtag="X1" inputmask="0x08"><bounds x="3.35" y="1.175" width="1.0" height="1.0" /></element>
+		<element ref="btn_4" inputtag="X0" inputmask="0x10"><bounds x="0.125" y="1.175" width="1.0" height="1.0" /></element>
+		<element ref="btn_5" inputtag="X0" inputmask="0x20"><bounds x="1.175" y="1.175" width="1.0" height="1.0" /></element>
+		<element ref="btn_6" inputtag="X0" inputmask="0x40"><bounds x="2.225" y="1.175" width="1.0" height="1.0" /></element>
+		<element ref="btn_b" inputtag="X1" inputmask="0x08"><bounds x="3.275" y="1.175" width="1.0" height="1.0" /></element>
 
-		<element ref="btn_1" inputtag="X0" inputmask="0x02"><bounds x="0.20" y="2.225" width="1.0" height="1.0" /></element>
-		<element ref="btn_2" inputtag="X0" inputmask="0x04"><bounds x="1.25" y="2.225" width="1.0" height="1.0" /></element>
-		<element ref="btn_3" inputtag="X0" inputmask="0x08"><bounds x="2.30" y="2.225" width="1.0" height="1.0" /></element>
-		<element ref="btn_c" inputtag="X1" inputmask="0x10"><bounds x="3.35" y="2.225" width="1.0" height="1.0" /></element>
+		<element ref="btn_1" inputtag="X0" inputmask="0x02"><bounds x="0.125" y="2.225" width="1.0" height="1.0" /></element>
+		<element ref="btn_2" inputtag="X0" inputmask="0x04"><bounds x="1.175" y="2.225" width="1.0" height="1.0" /></element>
+		<element ref="btn_3" inputtag="X0" inputmask="0x08"><bounds x="2.225" y="2.225" width="1.0" height="1.0" /></element>
+		<element ref="btn_c" inputtag="X1" inputmask="0x10"><bounds x="3.275" y="2.225" width="1.0" height="1.0" /></element>
 
-		<element ref="btn_0" inputtag="X0" inputmask="0x01"><bounds x="0.20" y="3.275" width="1.0" height="1.0" /></element>
-		<element ref="btn_f" inputtag="X1" inputmask="0x80"><bounds x="1.25" y="3.275" width="1.0" height="1.0" /></element>
-		<element ref="btn_e" inputtag="X1" inputmask="0x40"><bounds x="2.30" y="3.275" width="1.0" height="1.0" /></element>
-		<element ref="btn_d" inputtag="X1" inputmask="0x20"><bounds x="3.35" y="3.275" width="1.0" height="1.0" /></element>
+		<element ref="btn_0" inputtag="X0" inputmask="0x01"><bounds x="0.125" y="3.275" width="1.0" height="1.0" /></element>
+		<element ref="btn_f" inputtag="X1" inputmask="0x80"><bounds x="1.175" y="3.275" width="1.0" height="1.0" /></element>
+		<element ref="btn_e" inputtag="X1" inputmask="0x40"><bounds x="2.225" y="3.275" width="1.0" height="1.0" /></element>
+		<element ref="btn_d" inputtag="X1" inputmask="0x20"><bounds x="3.275" y="3.275" width="1.0" height="1.0" /></element>
 	</group>
 
 	<group name="leds">
-		<!-- Black background -->
 		<element ref="background">
-			<bounds left="1" top="65" right="900" bottom="200" />
-		</element>
-		<element name="digit1" ref="digit">
-			<bounds left="107" top="075" right="154" bottom="146" />
-		</element>
-		<element name="digit2" ref="digit">
-			<bounds left="155" top="075" right="202" bottom="146" />
-		</element>
-		<element name="digit3" ref="digit">
-			<bounds left="203" top="075" right="250" bottom="146" />
-		</element>
-		<element name="digit4" ref="digit">
-			<bounds left="275" top="075" right="322" bottom="146" />
-		</element>
-		<element name="digit5" ref="digit">
-			<bounds left="323" top="075" right="370" bottom="146" />
+			<bounds x="0" y="0" width="600" height="135" />
 		</element>
-		<element name="digit6" ref="digit">
-			<bounds left="371" top="075" right="418" bottom="146" />
-		</element>
-		<element name="digit7" ref="digit">
-			<bounds left="443" top="075" right="490" bottom="146" />
-		</element>
-		<element name="digit8" ref="digit">
-			<bounds left="491" top="075" right="538" bottom="146" />
+
+		<repeat count="9">
+			<param name="digitno" start="1" increment="1" />
+			<param name="x" start="107" increment="48" />
+			<element name="digit~digitno~" ref="digit">
+				<bounds x="~x~" y="10" width="47" height="71" />
+			</element>
+		</repeat>
+		<element name="adr_txt" ref="ADR">
+			<bounds x="100" width="355" y="110" height="15" />
 		</element>
-		<element name="digit9" ref="digit">
-			<bounds left="539" top="075" right="586" bottom="146" />
+		<element name="pwr_txt" ref="DAT">
+			<bounds x="437" width="156" y="110" height="15" />
 		</element>
+
 		<element name="ion_led" ref="red_led">
-			<bounds left="5" right="20" top="100" bottom="115" />
+			<bounds x="5" width="15" y="35" height="15" />
 		</element>
 		<element name="mon_led" ref="red_led">
-			<bounds left="5" right="20" top="125" bottom="140" />
+			<bounds x="5" width="15" y="60" height="15" />
 		</element>
 		<element name="run_led" ref="red_led">
-			<bounds left="5" right="20" top="150" bottom="165" />
+			<bounds x="5" width="15" y="85" height="15" />
 		</element>
 		<element name="pwr_led" ref="red_led">
-			<bounds left="5" right="20" top="175" bottom="190" />
+			<bounds x="5" width="15" y="110" height="15" />
 		</element>
 		<element name="ion_txt" ref="ION">
-			<bounds left="25" right="50" top="100" bottom="115" />
+			<bounds x="25" width="25" y="35" height="15" />
 		</element>
 		<element name="mon_txt" ref="MON">
-			<bounds left="25" right="50" top="125" bottom="140" />
+			<bounds x="25" width="25" y="60" height="15" />
 		</element>
 		<element name="run_txt" ref="RUN">
-			<bounds left="25" right="50" top="150" bottom="165" />
+			<bounds x="25" width="25" y="85" height="15" />
 		</element>
 		<element name="pwr_txt" ref="PWR">
-			<bounds left="25" right="50" top="175" bottom="190" />
-		</element>
-		<element name="adr_txt" ref="ADR">
-			<bounds left="100" right="455" top="175" bottom="190" />
-		</element>
-		<element name="pwr_txt" ref="DAT">
-			<bounds left="437" right="593" top="175" bottom="190" />
+			<bounds x="25" width="25" y="110" height="15"/>
 		</element>
 	</group>
 
 	<view name="LEDs and Keypad">
-		<bounds x="0" y="0" width="1000" height="400" />
-		<collection name="LEDs and Keypad">
-			<group ref="leds">
-				<bounds x="5" y="15" width="1000" height="150" />
-			</group>
+		<group ref="leds">
+			<bounds x="0" y="0" width="600" height="135" />
+		</group>
+		<collection name="Keypad">
 			<group ref="keypad">
-				<bounds x="720" y="15" width="220" height="220" />
+				<bounds x="600" y="0" width="200" height="200" />
 			</group>
 		</collection>
 	</view>
 
-	<view name="LEDs">
-		<bounds x="0" y="0" width="600" height="150" />
+	<view name="LEDs, Keypad, and Terminal">
 		<collection name="LEDs">
 			<group ref="leds">
-				<bounds x="0" y="8" width="900" height="130" />
+				<bounds x="0" y="0" width="600" height="135" />
 			</group>
 		</collection>
-	</view>
-
-	<view name="LEDs, Keypad, and Terminal">
-		<bounds x="0" y="0" width="1000" height="400" />
-		<collection name="LEDs and Keypad">
-			<group ref="leds">
-				<bounds x="5" y="15" width="1000" height="150" />
-			</group>
+		<collection name="Keypad">
 			<group ref="keypad">
-				<bounds x="720" y="15" width="220" height="220" />
+				<bounds x="400" y="135" width="200" height="200" />
 			</group>
 		</collection>
-		<screen index="0"><bounds x="120" y="160" width="400" height="300" /></screen>
+		<screen index="0"><bounds x="0" y="135" width="400" height="300" /></screen>
 	</view>
 </mamelayout>

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