← Back to branch summary

~ubuntu-branches/ubuntu/raring/mame/raring-proposed

« back to all changes in this revision

Viewing changes to src/mame/drivers/nmk16.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Jordi Mallach, Emmanuel Kasper
  • Date: 2011-12-19 22:56:27 UTC
  • mfrom: (0.1.2)
  • Revision ID: package-import@ubuntu.com-20111219225627-ub5oga1oys4ogqzm
Tags: 0.144-1
http://bugs.debian.org/651538
[ Jordi Mallach ]
* Fix syntax errors in DEP5 copyright file (lintian).
* Use a versioned copyright Format specification field.
* Update Vcs-* URLs.
* Move transitional packages to the new metapackages section, and make
  them priority extra.
* Remove references to GNU/Linux and MESS sources from copyright.
* Add build variables for s390x.
* Use .xz tarballs as it cuts 4MB for the upstream sources.
* Add nplayers.ini as a patch. Update copyright file to add CC-BY-SA-3.0.

[ Emmanuel Kasper ]
* New upstream release. Closes: #651538.
* Add Free Desktop compliant png icons of various sizes taken from
  the hydroxygen iconset
* Mess is now built from a new source package, to avoid possible source
  incompatibilities between mame and the mess overlay.
* Mame-tools are not built from the mame source package anymore, but
  from the mess source package

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/drivers/nmk16.c
2727
2727
        PORT_DIPSETTING(    0x04, "Thailand" )
2728
2728
        PORT_DIPSETTING(    0x0c, "Nevada" )
2729
2729
        PORT_DIPSETTING(    0x0e, DEF_STR( Japan ) )
2730
 
        PORT_DIPSETTING(    0x06, "Korea" )
 
2730
        PORT_DIPSETTING(    0x06, DEF_STR( Korea ) )
2731
2731
        PORT_DIPSETTING(    0x0a, "England" )
2732
 
        PORT_DIPSETTING(    0x02, "Hong Kong" )
2733
 
        PORT_DIPSETTING(    0x00, "China" )
 
2732
        PORT_DIPSETTING(    0x02, DEF_STR( Hong_Kong ) )
 
2733
        PORT_DIPSETTING(    0x00, DEF_STR( China ) )
2734
2734
        PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) )       PORT_DIPLOCATION("SW1:4,3")
2735
2735
        PORT_DIPSETTING(    0x20, DEF_STR( Easy ) )
2736
2736
        PORT_DIPSETTING(    0x30, DEF_STR( Normal ) )
3286
3286
        PORT_DIPSETTING(      0x0100, DEF_STR( Off ) )
3287
3287
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
3288
3288
        PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Region ) )               PORT_DIPLOCATION("SW2:7")
3289
 
        PORT_DIPSETTING(      0x0200, DEF_STR( English ) )
3290
 
        PORT_DIPSETTING(      0x0000, "China" )
 
3289
        PORT_DIPSETTING(      0x0200, DEF_STR( World ) )
 
3290
        PORT_DIPSETTING(      0x0000, DEF_STR( China ) )
3291
3291
        PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Free_Play ) )            PORT_DIPLOCATION("SW2:6")
3292
3292
        PORT_DIPSETTING(      0x0400, DEF_STR( Off ) )
3293
3293
        PORT_DIPSETTING(      0x0000, DEF_STR( On ) )