summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-06-19 19:29:25 +0000
committerGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-06-19 19:29:25 +0000
commite6050ace10f2c2271c110d667e1b67a6b4367e25 (patch)
treef856b597851f07e2f9f7e95b4d49710c392d09e2
parenta8c80b5a5f5df38c8080bb369c4a7c0e9f2b4b57 (diff)
Cleanups and version bumpmame0142u6
-rw-r--r--src/emu/clifront.c16
-rw-r--r--src/emu/cpu/i386/i386.c6
-rw-r--r--src/emu/cpu/i86/instr86.c4
-rw-r--r--src/emu/debug/debugcmd.c14
-rw-r--r--src/emu/devimage.c4
-rw-r--r--src/emu/devlegcy.h4
-rw-r--r--src/emu/diimage.c2
-rw-r--r--src/emu/diimage.h16
-rw-r--r--src/emu/imagedev/cassette.c4
-rw-r--r--src/emu/imagedev/cassette.h14
-rw-r--r--src/emu/imagedev/chd_cd.c4
-rw-r--r--src/emu/imagedev/chd_cd.h12
-rw-r--r--src/emu/imagedev/flopdrv.c2
-rw-r--r--src/emu/imagedev/harddriv.c4
-rw-r--r--src/emu/imagedev/harddriv.h12
-rw-r--r--src/emu/imagedev/printer.c2
-rw-r--r--src/emu/imagedev/printer.h12
-rw-r--r--src/emu/info.c8
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/sound/scsp.c2
-rw-r--r--src/emu/uiimage.c4
-rw-r--r--src/lib/formats/hect_dsk.c2
-rw-r--r--src/lib/formats/vtech1_dsk.c2
-rw-r--r--src/mame/drivers/aristmk4.c388
-rw-r--r--src/mame/drivers/cdi.c2
-rw-r--r--src/mame/drivers/crystal.c4
-rw-r--r--src/mame/drivers/jpmimpct.c18
-rw-r--r--src/mame/drivers/mpu4.c16
-rw-r--r--src/mame/drivers/mpu4drvr.c10
-rw-r--r--src/mame/drivers/saturn.c6
-rw-r--r--src/mame/drivers/vp101.c2
-rw-r--r--src/mame/drivers/warpsped.c108
-rw-r--r--src/mame/layout/3bagflnz.lay44
-rw-r--r--src/mame/layout/3bagflvt.lay50
-rw-r--r--src/mame/layout/arcwins.lay50
-rw-r--r--src/mame/layout/arimk4nz.lay50
-rw-r--r--src/mame/layout/aristmk4.lay50
-rw-r--r--src/mame/layout/cgold2.lay44
-rw-r--r--src/mame/layout/eforest.lay50
-rw-r--r--src/mame/layout/fhunter.lay44
-rw-r--r--src/mame/layout/gldnpkr.lay4
-rw-r--r--src/mame/layout/goldenc.lay50
-rw-r--r--src/mame/layout/kgbird.lay50
-rw-r--r--src/mame/layout/topgear.lay40
-rw-r--r--src/mame/layout/wildone.lay4
-rwxr-xr-xsrc/mame/machine/naomim4decoder.c16
-rwxr-xr-xsrc/mame/machine/naomim4decoder.h12
-rw-r--r--src/mame/machine/stvcd.c6
-rw-r--r--src/mame/machine/stvprot.c20
-rw-r--r--src/mame/video/midzeus.c4
-rw-r--r--src/mame/video/ojankohs.c10
-rw-r--r--src/mame/video/stvvdp1.c6
-rw-r--r--src/osd/windows/d3dhlsl.h2
-rw-r--r--src/osd/windows/debugwin.c68
-rw-r--r--src/osd/windows/winmain.c32
-rw-r--r--src/version.c2
56 files changed, 707 insertions, 707 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index 0975fc8c487..0b90cb4cf97 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -199,21 +199,21 @@ int cli_frontend::execute(int argc, char **argv)
if (list)
{
software_info *swinfo = software_list_find(list, m_options.software_name(), NULL);
- if (swinfo!=NULL) {
+ if (swinfo!=NULL) {
for (software_part *swpart = software_find_part(swinfo, NULL, NULL); swpart != NULL; swpart = software_part_next(swpart))
{
const char *mount = software_part_get_feature(swpart, "automount");
- if (mount==NULL || strcmp(mount,"no")!=0) {
- // loop trough all parts
- // search for a device with the right interface
+ if (mount==NULL || strcmp(mount,"no")!=0) {
+ // loop trough all parts
+ // search for a device with the right interface
const device_image_interface *image = NULL;
for (bool gotone = config.devicelist().first(image); gotone; gotone = image->next(image))
{
- const char *interface = image->image_interface();
+ const char *interface = image->image_interface();
if (interface != NULL)
- {
+ {
if (!strcmp(interface, swpart->interface_))
- {
+ {
const char *option = m_options.value(image->brief_instance_name());
// mount only if not already mounted
if (strlen(option)==0) {
@@ -221,7 +221,7 @@ int cli_frontend::execute(int argc, char **argv)
astring error;
val.printf("%s:%s",m_options.software_name(),swpart->name);
m_options.set_value(image->brief_instance_name(), val.cstr(), OPTION_PRIORITY_CMDLINE, error);
- assert(!error);
+ assert(!error);
}
break;
}
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index 2039edb44e5..b07d84bdcbb 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -519,7 +519,7 @@ static void i386_trap(i386_state *cpustate,int irq, int irq_gate, int trap_level
i386_load_protected_mode_segment(cpustate,&desc);
CPL = cpustate->CPL; // current privilege level
DPL = (desc.flags >> 5) & 0x03; // descriptor privilege level
-// RPL = segment & 0x03; // requested privilege level
+// RPL = segment & 0x03; // requested privilege level
if((segment & ~0x07) == 0)
{
@@ -816,7 +816,7 @@ static void i286_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested
}
/* For nested tasks, we write the outgoing task's selector to the back-link field of the new TSS,
- and set the NT flag in the EFLAGS register */
+ and set the NT flag in the EFLAGS register */
if(nested != 0)
{
WRITE16(cpustate,tss+0,old_task);
@@ -929,7 +929,7 @@ static void i386_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested
}
/* For nested tasks, we write the outgoing task's selector to the back-link field of the new TSS,
- and set the NT flag in the EFLAGS register */
+ and set the NT flag in the EFLAGS register */
if(nested != 0)
{
WRITE32(cpustate,tss+0,old_task);
diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c
index 9c94ff6ca78..595b0ec6f3f 100644
--- a/src/emu/cpu/i86/instr86.c
+++ b/src/emu/cpu/i86/instr86.c
@@ -72,7 +72,7 @@ static void PREFIX86(_trap)(i8086_state *cpustate)
#ifndef I80186
static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM, unsigned count, unsigned src)
{
-// unsigned src = (unsigned)GetRMByte(ModRM);
+// unsigned src = (unsigned)GetRMByte(ModRM);
unsigned dst=src;
if (count==0)
@@ -208,7 +208,7 @@ static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM,
static void PREFIX86(_rotate_shift_Word)(i8086_state *cpustate, unsigned ModRM, unsigned count, unsigned src)
{
-// unsigned src = GetRMWord(ModRM);
+// unsigned src = GetRMWord(ModRM);
unsigned dst=src;
if (count==0)
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index e5d4a6f27b1..5f5606f1968 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -2677,12 +2677,12 @@ static void execute_hardreset(running_machine &machine, int ref, int params, con
/*-------------------------------------------------
execute_images - lists all image devices with
- mounted files
+ mounted files
-------------------------------------------------*/
static void execute_images(running_machine &machine, int ref, int params, const char **param)
{
- device_image_interface *img = NULL;
+ device_image_interface *img = NULL;
for (bool gotone = machine.devicelist().first(img); gotone; gotone = img->next(img))
{
debug_console_printf(machine, "%s: %s\n",img->brief_instance_name(),img->exists() ? img->filename() : "[empty slot]");
@@ -2698,7 +2698,7 @@ static void execute_images(running_machine &machine, int ref, int params, const
static void execute_mount(running_machine &machine, int ref, int params, const char **param)
{
- device_image_interface *img = NULL;
+ device_image_interface *img = NULL;
bool done = false;
for (bool gotone = machine.devicelist().first(img); gotone; gotone = img->next(img))
{
@@ -2707,8 +2707,8 @@ static void execute_mount(running_machine &machine, int ref, int params, const c
debug_console_printf(machine, "Unable to mount file %s on %s\n",param[1],param[0]);
} else {
debug_console_printf(machine, "File %s mounted on %s\n",param[1],param[0]);
- }
- done = true;
+ }
+ done = true;
break;
}
}
@@ -2722,14 +2722,14 @@ static void execute_mount(running_machine &machine, int ref, int params, const c
static void execute_unmount(running_machine &machine, int ref, int params, const char **param)
{
- device_image_interface *img = NULL;
+ device_image_interface *img = NULL;
bool done = false;
for (bool gotone = machine.devicelist().first(img); gotone; gotone = img->next(img))
{
if (strcmp(img->brief_instance_name(),param[0])==0) {
img->unload();
debug_console_printf(machine, "Unmounted file from : %s\n",param[0]);
- done = true;
+ done = true;
break;
}
}
diff --git a/src/emu/devimage.c b/src/emu/devimage.c
index 361b25207b6..7ab5318b8b6 100644
--- a/src/emu/devimage.c
+++ b/src/emu/devimage.c
@@ -105,10 +105,10 @@ void legacy_image_device_base::device_config_complete()
}
update_names();
-
+
// Override in case of hardcoded values
if (strlen(get_legacy_string(DEVINFO_STR_IMAGE_INSTANCE_NAME))>0) {
- m_instance_name = get_legacy_string(DEVINFO_STR_IMAGE_INSTANCE_NAME);
+ m_instance_name = get_legacy_string(DEVINFO_STR_IMAGE_INSTANCE_NAME);
}
if (strlen(get_legacy_string(DEVINFO_STR_IMAGE_BRIEF_INSTANCE_NAME))>0) {
m_brief_instance_name = get_legacy_string(DEVINFO_STR_IMAGE_BRIEF_INSTANCE_NAME);
diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h
index bb58b0cf92f..52d685cd780 100644
--- a/src/emu/devlegcy.h
+++ b/src/emu/devlegcy.h
@@ -523,8 +523,8 @@ public:
virtual void call_get_devices();
virtual void *get_device_specific_call();
- virtual iodevice_t image_type() const { return static_cast<iodevice_t>(get_legacy_int(DEVINFO_INT_IMAGE_TYPE)); }
-
+ virtual iodevice_t image_type() const { return static_cast<iodevice_t>(get_legacy_int(DEVINFO_INT_IMAGE_TYPE)); }
+
virtual bool is_readable() const { return get_legacy_int(DEVINFO_INT_IMAGE_READABLE)!=0; }
virtual bool is_writeable() const { return get_legacy_int(DEVINFO_INT_IMAGE_WRITEABLE)!=0; }
virtual bool is_creatable() const { return get_legacy_int(DEVINFO_INT_IMAGE_CREATABLE)!=0; }
diff --git a/src/emu/diimage.c b/src/emu/diimage.c
index 773d215cd81..ab785964cf0 100644
--- a/src/emu/diimage.c
+++ b/src/emu/diimage.c
@@ -1032,4 +1032,4 @@ void device_image_interface::update_names()
m_instance_name = device_typename(image_type());
m_brief_instance_name = device_brieftypename(image_type());
}
-} \ No newline at end of file
+}
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 2a4af0d69fd..f87622638e0 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -182,12 +182,12 @@ public:
virtual const char *image_interface() const { return NULL; }
virtual const char *file_extensions() const = 0;
virtual const option_guide *create_option_guide() const = 0;
-
+
const image_device_format *device_get_indexed_creatable_format(int index);
const image_device_format *device_get_named_creatable_format(const char *format_name);
const option_guide *device_get_creation_option_guide() { return create_option_guide(); }
const image_device_format *device_get_creatable_formats() { return formatlist(); }
-
+
const char *error();
void seterror(image_error_t err, const char *message);
void message(const char *format, ...);
@@ -233,11 +233,11 @@ public:
void battery_load(void *buffer, int length, int fill);
void battery_save(const void *buffer, int length);
-
+
const char *image_type_name() const { return device_typename(image_type()); }
-
+
const char *instance_name() const { return m_instance_name; }
const char *brief_instance_name() const { return m_brief_instance_name; }
bool uses_file_extension(const char *file_extension) const;
@@ -247,7 +247,7 @@ public:
bool finish_load();
void unload();
bool create(const char *path, const image_device_format *create_format, option_resolution *create_args);
- bool load_software(char *swlist, char *swname, rom_entry *entry);
+ bool load_software(char *swlist, char *swname, rom_entry *entry);
protected:
bool load_internal(const char *path, bool is_create, int create_format, option_resolution *create_args);
void determine_open_plan(int is_create, UINT32 *open_plan);
@@ -311,12 +311,12 @@ protected:
option_resolution *m_create_args;
hash_collection m_hash;
-
+
astring m_brief_instance_name;
astring m_instance_name;
-
+
/* creation info */
- image_device_format *m_formatlist;
+ image_device_format *m_formatlist;
bool m_is_loading;
};
diff --git a/src/emu/imagedev/cassette.c b/src/emu/imagedev/cassette.c
index 62be33ce9b4..39bb0057957 100644
--- a/src/emu/imagedev/cassette.c
+++ b/src/emu/imagedev/cassette.c
@@ -73,11 +73,11 @@ void cassette_image_device::device_config_complete()
memset(&m_interface, 0, sizeof(m_interface));
memset(&m_device_displayinfo, 0, sizeof(m_device_displayinfo));
}
-
+
m_extension_list[0] = '\0';
for (int i = 0; m_formats[i]; i++ )
image_specify_extension( m_extension_list, 256, m_formats[i]->extensions );
-
+
// set brief and instance name
update_names();
}
diff --git a/src/emu/imagedev/cassette.h b/src/emu/imagedev/cassette.h
index 922c7c9bcbb..d1956f97935 100644
--- a/src/emu/imagedev/cassette.h
+++ b/src/emu/imagedev/cassette.h
@@ -69,8 +69,8 @@ public:
virtual void call_display_info() { if (m_device_displayinfo) m_device_displayinfo(*this); }
virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { return load_software(swlist, swname, start_entry); }
- virtual iodevice_t image_type() const { return IO_CASSETTE; }
-
+ virtual iodevice_t image_type() const { return IO_CASSETTE; }
+
virtual bool is_readable() const { return 1; }
virtual bool is_writeable() const { return 1; }
virtual bool is_creatable() const { return 1; }
@@ -79,7 +79,7 @@ public:
virtual const char *image_interface() const { return m_interface; }
virtual const char *file_extensions() const { return m_extension_list; }
virtual const option_guide *create_option_guide() const { return NULL; }
-
+
// specific implementation
cassette_state get_state() { return m_state; }
void set_state(cassette_state state) { change_state(m_state, (cassette_state)(~0)); }
@@ -92,20 +92,20 @@ public:
double get_position();
double get_length();
void seek(double time, int origin);
-
+
protected:
bool is_motor_on();
void update();
-
+
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
-private:
+private:
cassette_image *m_cassette;
cassette_state m_state;
double m_position;
double m_position_time;
- INT32 m_value;
+ INT32 m_value;
char m_extension_list[256];
};
diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c
index 28971f5d2a0..8687882605e 100644
--- a/src/emu/imagedev/chd_cd.c
+++ b/src/emu/imagedev/chd_cd.c
@@ -100,9 +100,9 @@ void cdrom_image_device::device_config_complete()
format->m_extensions = "chd";
format->m_optspec = cd_option_spec;
format->m_next = NULL;
-
+
m_formatlist = format;
-
+
// set brief and instance name
update_names();
}
diff --git a/src/emu/imagedev/chd_cd.h b/src/emu/imagedev/chd_cd.h
index 82ab73ed48f..8095b1dd3ad 100644
--- a/src/emu/imagedev/chd_cd.h
+++ b/src/emu/imagedev/chd_cd.h
@@ -18,7 +18,7 @@
struct cdrom_interface
{
- const char * m_interface;
+ const char * m_interface;
device_image_display_info_func m_device_displayinfo;
};
@@ -39,8 +39,8 @@ public:
virtual void call_display_info() { if (m_device_displayinfo) m_device_displayinfo(*this); }
virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { return load_software(swlist, swname, start_entry); }
- virtual iodevice_t image_type() const { return IO_CDROM; }
-
+ virtual iodevice_t image_type() const { return IO_CDROM; }
+
virtual bool is_readable() const { return 1; }
virtual bool is_writeable() const { return 0; }
virtual bool is_creatable() const { return 0; }
@@ -49,14 +49,14 @@ public:
virtual const char *image_interface() const { return m_interface; }
virtual const char *file_extensions() const { return "chd"; }
virtual const option_guide *create_option_guide() const;
-
+
// specific implementation
- cdrom_file *get_cdrom_file() { return m_cdrom_handle; }
+ cdrom_file *get_cdrom_file() { return m_cdrom_handle; }
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
-
+
cdrom_file *m_cdrom_handle;
image_device_format m_format;
};
diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c
index 19282aab650..a81af75c030 100644
--- a/src/emu/imagedev/flopdrv.c
+++ b/src/emu/imagedev/flopdrv.c
@@ -634,7 +634,7 @@ static int internal_floppy_device_load(device_image_interface *image, int create
}
/* disk changed */
flopimg->dskchg = CLEAR_LINE;
-
+
return IMAGE_INIT_PASS;
error:
diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c
index 53039069fb2..19ec4128a5e 100644
--- a/src/emu/imagedev/harddriv.c
+++ b/src/emu/imagedev/harddriv.c
@@ -116,9 +116,9 @@ void harddisk_image_device::device_config_complete()
format->m_extensions = "chd,hd";
format->m_optspec = hd_option_spec;
format->m_next = NULL;
-
+
m_formatlist = format;
-
+
// set brief and instance name
update_names();
}
diff --git a/src/emu/imagedev/harddriv.h b/src/emu/imagedev/harddriv.h
index 75bd49dc1b8..10420c23bdf 100644
--- a/src/emu/imagedev/harddriv.h
+++ b/src/emu/imagedev/harddriv.h
@@ -40,8 +40,8 @@ public:
virtual bool call_create(int create_format, option_resolution *create_args);
virtual void call_unload();
- virtual iodevice_t image_type() const { return IO_HARDDISK; }
-
+ virtual iodevice_t image_type() const { return IO_HARDDISK; }
+
virtual bool is_readable() const { return 1; }
virtual bool is_writeable() const { return 1; }
virtual bool is_creatable() const { return 0; }
@@ -49,7 +49,7 @@ public:
virtual bool is_reset_on_load() const { return 0; }
virtual const char *file_extensions() const { return "chd,hd"; }
virtual const option_guide *create_option_guide() const;
-
+
// specific implementation
hard_disk_file *get_hard_disk_file() { return m_hard_disk_handle; }
chd_file *get_chd_file();
@@ -58,13 +58,13 @@ protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
-
+
int internal_load_hd(const char *metadata);
-
+
chd_file *m_chd;
hard_disk_file *m_hard_disk_handle;
- image_device_format m_format;
+ image_device_format m_format;
};
// device type definition
diff --git a/src/emu/imagedev/printer.c b/src/emu/imagedev/printer.c
index 9137583931d..0164ca60282 100644
--- a/src/emu/imagedev/printer.c
+++ b/src/emu/imagedev/printer.c
@@ -50,7 +50,7 @@ void printer_image_device::device_config_complete()
{
memset(&m_online, 0, sizeof(m_online));
}
-
+
// set brief and instance name
update_names();
}
diff --git a/src/emu/imagedev/printer.h b/src/emu/imagedev/printer.h
index 4348cf487b4..5e059e87b8d 100644
--- a/src/emu/imagedev/printer.h
+++ b/src/emu/imagedev/printer.h
@@ -38,8 +38,8 @@ public:
virtual bool call_load();
virtual void call_unload();
- virtual iodevice_t image_type() const { return IO_PRINTER; }
-
+ virtual iodevice_t image_type() const { return IO_PRINTER; }
+
virtual bool is_readable() const { return 0; }
virtual bool is_writeable() const { return 1; }
virtual bool is_creatable() const { return 1; }
@@ -48,18 +48,18 @@ public:
virtual const char *image_interface() const { return NULL; }
virtual const char *file_extensions() const { return "prn"; }
virtual const option_guide *create_option_guide() const { return NULL; }
-
+
// specific implementation
-
+
/* checks to see if a printer is ready */
int is_ready();
/* outputs data to a printer */
- void output(UINT8 data);
+ void output(UINT8 data);
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
-
+
devcb_resolved_write_line m_online_func;
};
diff --git a/src/emu/info.c b/src/emu/info.c
index 460cb5b03b9..db8d6db9977 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -1098,10 +1098,10 @@ void info_xml_creator::output_slots()
fprintf(m_output, "\t\t<slot name=\"%s\">\n", xml_normalize_string(slot->device().tag()));
/*
- if (slot->slot_interface()[0])
- fprintf(m_output, " interface=\"%s\"", xml_normalize_string(slot->slot_interface()));
- */
-
+ if (slot->slot_interface()[0])
+ fprintf(m_output, " interface=\"%s\"", xml_normalize_string(slot->slot_interface()));
+ */
+
const slot_interface* intf = slot->get_slot_interfaces();
for (int i = 0; intf[i].name != NULL; i++)
{
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 18bf6c0a50c..8a6e1014b68 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -3338,7 +3338,7 @@ void address_table::setup_range_solid(offs_t addrstart, offs_t addrend, offs_t a
// entry and requests to populate the address map with
// it. Handle non-overlapping subunits.
//-------------------------------------------------
-
+
namespace {
struct subrange {
offs_t start, end;
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index f3f15455fb6..8ae615a6ea2 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -236,7 +236,7 @@ static void dma_scsp(address_space *space, scsp_state *scsp); /*state DMA trans
#define scsp_ddir scsp->scsp_dmactrl & 0x2000
#define scsp_dexe scsp->scsp_dmactrl & 0x1000
/* TODO */
-//#define dma_transfer_end ((scsp_regs[0x24/2] & 0x10)>>4)|(((scsp_regs[0x26/2] & 0x10)>>4)<<1)|(((scsp_regs[0x28/2] & 0x10)>>4)<<2)
+//#define dma_transfer_end ((scsp_regs[0x24/2] & 0x10)>>4)|(((scsp_regs[0x26/2] & 0x10)>>4)<<1)|(((scsp_regs[0x28/2] & 0x10)>>4)<<2)
static const float SDLT[8]={-1000000.0f,-36.0f,-30.0f,-24.0f,-18.0f,-12.0f,-6.0f,0.0f};
diff --git a/src/emu/uiimage.c b/src/emu/uiimage.c
index 8861c6188e6..65fdf5196b5 100644
--- a/src/emu/uiimage.c
+++ b/src/emu/uiimage.c
@@ -1394,9 +1394,9 @@ void ui_mess_menu_tape_control(running_machine &machine, ui_menu *menu, void *pa
/* rebuild the menu - we have to do this so that the counter updates */
ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_POSITION);
menu_tape_control_populate(machine, menu, (tape_control_menu_state*)state);
-
+
cassette_image_device* cassette = dynamic_cast<cassette_image_device*>(&menustate->device->device());
-
+
/* process the menu */
event = ui_menu_process(machine, menu, UI_MENU_PROCESS_LR_REPEAT);
if (event != NULL)
diff --git a/src/lib/formats/hect_dsk.c b/src/lib/formats/hect_dsk.c
index f6416ec7a53..9a704c538a3 100644
--- a/src/lib/formats/hect_dsk.c
+++ b/src/lib/formats/hect_dsk.c
@@ -93,4 +93,4 @@ FLOPPY_OPTIONS_START( hector_disc2 )
FLOPPY_OPTION( hector_dsk, "HE2", "hector disc2 floppy disk image 200K", hector_disc2_dsk200_identify, hector_disc2_dsk200_construct, NULL, NULL)
FLOPPY_OPTION( hector_dsk, "HE7", "hector disc2 floppy disk image 720K", hector_disc2_dsk720_identify, hector_disc2_dsk720_construct, NULL, NULL)
FLOPPY_OPTION( hector_dsk, "HE8", "hector disc2 floppy disk image 800K", hector_disc2_dsk800_identify, hector_disc2_dsk800_construct, NULL, NULL)
-FLOPPY_OPTIONS_END \ No newline at end of file
+FLOPPY_OPTIONS_END
diff --git a/src/lib/formats/vtech1_dsk.c b/src/lib/formats/vtech1_dsk.c
index b52ca3af16c..7a6d4a1176d 100644
--- a/src/lib/formats/vtech1_dsk.c
+++ b/src/lib/formats/vtech1_dsk.c
@@ -30,4 +30,4 @@ FLOPPY_OPTIONS_START( vtech1_only )
NULL,
NULL
)
-FLOPPY_OPTIONS_END0 \ No newline at end of file
+FLOPPY_OPTIONS_END0
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index 663ee3dbff8..26bbe8f2aed 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -1,199 +1,199 @@
/*
- Driver: aristmk4
-
- Manufacturer: Aristocrat Leisure Industries ( aka Ainsworth Nominees P.L. )
- Platform: Aristocrat 540 Video ( MK 2.5 Video / MK IV )
- Driver by Palindrome & FraSher
-
- original 86lions.c driver by Chris Hardy, Angelo Salese & Roberto Fresca
-
- ***************** INITIALISATION *********************************************************************
-
- Method 1 :
- * Key in with the Jackpot Key followed by the Audit Key
- * Press PB4, PB5 and PB6 keys simultaneously (Z+X+C keys by default)
- * A value (displayed below) will appear next to RF/AMT on the right of the screen
- * Key out both the Jackpot and Audit Keys
-
- This method works with the following games:
- 3bagflnz 200
- 3bagflvt 200
- autmoon 200
- blkrhino 200
- coralr2 200
- eforesta 200
- eforestb 200
- ffortune 200
- gldnpkr 400
- goldenc 200
- gtroppo 500
- kgbird 200
- kgbirda 200
- phantomp 200
- swtht2nz 200
- wildone 200
- wtigernz 200
-
- Method 2 :
- * Key in with the Jackpot Key followed by the Audit Key
- * Press PB4, PB5 and PB6 keys simultaneously (Z+X+C keys by default)
- * This will enter the cashcade screen and increment $100 to the maximum
- * Press PLAY 2 LINES [listed as BET 2 on the screen] to increment the minimum cashcade value by $5
- - (optionally, you can decrement with the PLAY 1 LINE [BET 1] button, but you must first increment the $5 to start with above or the game won't initialise)
- * A value (displayed below) will appear on the right as RF/AMT when you key in again (not visible until you key out and back in again with the Audit Key)
- * Key out both the Jackpot and Audit Keys
-
- This method works with the following games:
- topgear 500
-
- Technical Notes:
-
- 68B09EP Motorola Processor
- R6545AP for CRT video controller
- UPD43256BCZ-70LL for 32kb of static ram used for 3 way electronic meters / 3 way memory
- U6264A for Standard 8K x 8 bit SRAM used for video buffer
- 1 x R65C21P2 PIA - Peripheral Interface Adapter, connects to RTC and sends pulses to mechanical meters
- 1 x 6522 VIA - 1 x Rockwell - Versatile Interface Adapter.
- 2 x WF19054 = AY3-8910 sound chips driven by the 6522 VIA
- 1 x PML 2852 ( programmable logic ) used as address decoder.
- 1 x PML 2852 programmed as a PIA
-
- PIA provides output signals to six mechanical meters.
- It also provides the real time clock DS1287 to the CPU.
-
- VIA drives the programmable sound generators and generates
- a timing interrupt to the CPU (M6809_FIRQ_LINE)
-
- The VIA uses Port A to write to the D0-D7 on the AY8910s. Port B hooks first 4 bits up to BC1/BC2/BDIR and A9 on AY1 and A8 on AY2
- The remaining 4 bits are connected to other hardware, read via the VIA.
-
- The AY8910 named ay1 has writes on PORT B to the ZN434 DA convertor.
- The AY8910 named ay2 has writes to lamps and the light tower on Port A and B. these are implemented via the layout
-
- 27/04/10 - FrasheR
- 2 x Sound Chips connected to the 6522 VIA.
-
- 16/05/10 - FrasheR
- Fixed VIA for good. 5010 - 501F.
- Hooked up push button inputs - FrasheR
- Hooked up ports for the PML 2852 U3 - FrasheR
-
- 16/05/10 - Palindrome
- Lamp outputs and layout added - Palindrome
- NVRAM backup - Palindrome
-
- 20/05/10 - Palindrome
- Connected SW7 for BGCOLOUR map select
- Added LK13. 3Mhz or 1.5 Mhz CPU speed select
- Added sound sample for mechanical meter pulse ( aristmk4.zip ).
-
- 30/5/10 - Palindrome
- Now using mc146818 rtc driver instead of rtc_get_reg.
-
- The mc146818 driver has issues and is not working correctly.
- MESS developers are looking at it.
-
- - day of week is incorrect
- - day of month is incorrect ( code is using day instead of mday ).
- - hours are not showing up correct in PM and 12 hour mode
- - rtc causes game to freeze if the game is left in audit mode with continuous writes to 0xA reg - 0x80 data )
-
- 9/7/2010 - Palindrome
- Robot Test added
- Default Jackpot key re-assigned to 'I'
- Work around for topgear & cashcade games
- Improved coininput - force CBOPT1 to detect passing coin
- Added new game Golden Poker ( Aristocrat version ) [ bad dump ]
- Added new game Gone Troppo
- Added new game Wild One
- Misc improvements
-
- 12/12/2010 - Palindrome and Heihachi_73
- Updated source to 0.140u2 standards
- Disabled real time clock to stop games from hanging. This causes a graphics glitch on the month display but makes the games more reliable in audit mode.
- Fixed ROM names
- Added new game Arctic Wins
- Added new game Caribbean Gold 2 (missing 2 gfx roms, still boots)
- Added new game Clockwise (program ROM nodump, all other roms fine)
- Added new game Fortune Hunter (2 sets)
-
- 06/06/2011 - Heihachi_73
- Added button panel artwork for all games, and renamed the in-game buttons to match the artwork and/or Robot Test description.
- Remapped Jackpot Key to 'L'
- Remapped 'power fail' key to ',' (comma)
- Remapped the video poker buttons; holds are now keys S,D,F,G,H
- Un-mapped the unused inputs
-
- When the games first power on (or when reset), they will display a TILT message on the screen. This doesn't affect gameplay, and if there are no pending errors the game should coin up and/or play immediately.
- The tilt message will also appear when an error code is displayed, such as the main door being opened/closed, or a hardware error/fault (such as hopper empty, coin yoyo, printer errors; none of which should happen MAME however).
- The tilt message will disappear if you turn the Audit Key on and off, or after you start playing.
- Despite the name, there is no 'tilt' mechanism in the machine and there is nothing to worry about. The first Aristocrat system to have a tilt mechanism was the MK5, which will cause the machine to reset abruptly if the player is too rough (e.g. hitting the screen or bumping the machine).
+ Driver: aristmk4
+
+ Manufacturer: Aristocrat Leisure Industries ( aka Ainsworth Nominees P.L. )
+ Platform: Aristocrat 540 Video ( MK 2.5 Video / MK IV )
+ Driver by Palindrome & FraSher
+
+ original 86lions.c driver by Chris Hardy, Angelo Salese & Roberto Fresca
+
+ ***************** INITIALISATION *********************************************************************
+
+ Method 1 :
+ * Key in with the Jackpot Key followed by the Audit Key
+ * Press PB4, PB5 and PB6 keys simultaneously (Z+X+C keys by default)
+ * A value (displayed below) will appear next to RF/AMT on the right of the screen
+ * Key out both the Jackpot and Audit Keys
+
+ This method works with the following games:
+ 3bagflnz 200
+ 3bagflvt 200
+ autmoon 200
+ blkrhino 200
+ coralr2 200
+ eforesta 200
+ eforestb 200
+ ffortune 200
+ gldnpkr 400
+ goldenc 200
+ gtroppo 500
+ kgbird 200
+ kgbirda 200
+ phantomp 200
+ swtht2nz 200
+ wildone 200
+ wtigernz 200
+
+ Method 2 :
+ * Key in with the Jackpot Key followed by the Audit Key
+ * Press PB4, PB5 and PB6 keys simultaneously (Z+X+C keys by default)
+ * This will enter the cashcade screen and increment $100 to the maximum
+ * Press PLAY 2 LINES [listed as BET 2 on the screen] to increment the minimum cashcade value by $5
+ - (optionally, you can decrement with the PLAY 1 LINE [BET 1] button, but you must first increment the $5 to start with above or the game won't initialise)
+ * A value (displayed below) will appear on the right as RF/AMT when you key in again (not visible until you key out and back in again with the Audit Key)
+ * Key out both the Jackpot and Audit Keys
+
+ This method works with the following games:
+ topgear 500
+
+ Technical Notes:
+
+ 68B09EP Motorola Processor
+ R6545AP for CRT video controller
+ UPD43256BCZ-70LL for 32kb of static ram used for 3 way electronic meters / 3 way memory
+ U6264A for Standard 8K x 8 bit SRAM used for video buffer
+ 1 x R65C21P2 PIA - Peripheral Interface Adapter, connects to RTC and sends pulses to mechanical meters
+ 1 x 6522 VIA - 1 x Rockwell - Versatile Interface Adapter.
+ 2 x WF19054 = AY3-8910 sound chips driven by the 6522 VIA
+ 1 x PML 2852 ( programmable logic ) used as address decoder.
+ 1 x PML 2852 programmed as a PIA
+
+ PIA provides output signals to six mechanical meters.
+ It also provides the real time clock DS1287 to the CPU.
+
+ VIA drives the programmable sound generators and generates
+ a timing interrupt to the CPU (M6809_FIRQ_LINE)
+
+ The VIA uses Port A to write to the D0-D7 on the AY8910s. Port B hooks first 4 bits up to BC1/BC2/BDIR and A9 on AY1 and A8 on AY2
+ The remaining 4 bits are connected to other hardware, read via the VIA.
+
+ The AY8910 named ay1 has writes on PORT B to the ZN434 DA convertor.
+ The AY8910 named ay2 has writes to lamps and the light tower on Port A and B. these are implemented via the layout
+
+ 27/04/10 - FrasheR
+ 2 x Sound Chips connected to the 6522 VIA.
+
+ 16/05/10 - FrasheR
+ Fixed VIA for good. 5010 - 501F.
+ Hooked up push button inputs - FrasheR
+ Hooked up ports for the PML 2852 U3 - FrasheR
+
+ 16/05/10 - Palindrome
+ Lamp outputs and layout added - Palindrome
+ NVRAM backup - Palindrome
+
+ 20/05/10 - Palindrome
+ Connected SW7 for BGCOLOUR map select
+ Added LK13. 3Mhz or 1.5 Mhz CPU speed select
+ Added sound sample for mechanical meter pulse ( aristmk4.zip ).
+
+ 30/5/10 - Palindrome
+ Now using mc146818 rtc driver instead of rtc_get_reg.
+
+ The mc146818 driver has issues and is not working correctly.
+ MESS developers are looking at it.
+
+ - day of week is incorrect
+ - day of month is incorrect ( code is using day instead of mday ).
+ - hours are not showing up correct in PM and 12 hour mode
+ - rtc causes game to freeze if the game is left in audit mode with continuous writes to 0xA reg - 0x80 data )
+
+ 9/7/2010 - Palindrome
+ Robot Test added
+ Default Jackpot key re-assigned to 'I'
+ Work around for topgear & cashcade games
+ Improved coininput - force CBOPT1 to detect passing coin
+ Added new game Golden Poker ( Aristocrat version ) [ bad dump ]
+ Added new game Gone Troppo
+ Added new game Wild One
+ Misc improvements
+
+ 12/12/2010 - Palindrome and Heihachi_73
+ Updated source to 0.140u2 standards
+ Disabled real time clock to stop games from hanging. This causes a graphics glitch on the month display but makes the games more reliable in audit mode.
+ Fixed ROM names
+ Added new game Arctic Wins
+ Added new game Caribbean Gold 2 (missing 2 gfx roms, still boots)
+ Added new game Clockwise (program ROM nodump, all other roms fine)
+ Added new game Fortune Hunter (2 sets)
+
+ 06/06/2011 - Heihachi_73
+ Added button panel artwork for all games, and renamed the in-game buttons to match the artwork and/or Robot Test description.
+ Remapped Jackpot Key to 'L'
+ Remapped 'power fail' key to ',' (comma)
+ Remapped the video poker buttons; holds are now keys S,D,F,G,H
+ Un-mapped the unused inputs
+
+ When the games first power on (or when reset), they will display a TILT message on the screen. This doesn't affect gameplay, and if there are no pending errors the game should coin up and/or play immediately.
+ The tilt message will also appear when an error code is displayed, such as the main door being opened/closed, or a hardware error/fault (such as hopper empty, coin yoyo, printer errors; none of which should happen MAME however).
+ The tilt message will disappear if you turn the Audit Key on and off, or after you start playing.
+ Despite the name, there is no 'tilt' mechanism in the machine and there is nothing to worry about. The first Aristocrat system to have a tilt mechanism was the MK5, which will cause the machine to reset abruptly if the player is too rough (e.g. hitting the screen or bumping the machine).
- These games do not feature a backup mechanism in case of power faults or system crashes requiring a reboot; if the player was in the middle of a spin or watching a win count up, any credits won on that spin will be voided.
- On the machine's artwork, this is reflected with text reading 'Malfunction voids all pays and plays', of which the text has also been carried onto later machines. The Aristocrat MK5 and later systems however feature backup mechanisms and will repeat the last game (including free game features and/or gamble selection) when powered on, to where the player had left off.
+ These games do not feature a backup mechanism in case of power faults or system crashes requiring a reboot; if the player was in the middle of a spin or watching a win count up, any credits won on that spin will be voided.
+ On the machine's artwork, this is reflected with text reading 'Malfunction voids all pays and plays', of which the text has also been carried onto later machines. The Aristocrat MK5 and later systems however feature backup mechanisms and will repeat the last game (including free game features and/or gamble selection) when powered on, to where the player had left off.
- Gone Troppo and Caribbean Gold 2 require DIP SW7 to be set to off/off or else the second screen will be broken. This is possibly true to the original machine.
- A similar thing happens with Top Gear, the drag cars' tyres will only be the correct colour (grey) if SW7 is off/off.
- In Wild One, the dollar sign on the Insert $2 graphic is the wrong colour on other settings as well. It only appears correct when SW7 is off/off. This is probably a bug in the original game, where the graphic designers have used the wrong palette for the background of the dollar sign.
- From these findings, it is noted that the off/off setting may in fact be the default background setting of all games.
+ Gone Troppo and Caribbean Gold 2 require DIP SW7 to be set to off/off or else the second screen will be broken. This is possibly true to the original machine.
+ A similar thing happens with Top Gear, the drag cars' tyres will only be the correct colour (grey) if SW7 is off/off.
+ In Wild One, the dollar sign on the Insert $2 graphic is the wrong colour on other settings as well. It only appears correct when SW7 is off/off. This is probably a bug in the original game, where the graphic designers have used the wrong palette for the background of the dollar sign.
+ From these findings, it is noted that the off/off setting may in fact be the default background setting of all games.
- Top Gear and Gone Troppo are non-multiplier, 5 payline games, therefore, you cannot bet higher than 5 credits on these machines.
+ Top Gear and Gone Troppo are non-multiplier, 5 payline games, therefore, you cannot bet higher than 5 credits on these machines.
- TODO:
- 1. Video poker and Keno button panels needed. 06/06/11: Video poker panels done, however they need confirmation with a real machine.
+ TODO:
+ 1. Video poker and Keno button panels needed. 06/06/11: Video poker panels done, however they need confirmation with a real machine.
- 2. Extend the driver to use the keno keyboard input for keno games (no MK2.5/MKIV Keno games dumped yet as of 28/02/2010).
+ 2. Extend the driver to use the keno keyboard input for keno games (no MK2.5/MKIV Keno games dumped yet as of 28/02/2010).
- 3. arcwins, eforest, fhunter, fhuntera and cgold2 do not work (these US-based games require note acceptor and printer support).
- - fhunter, fhuntera and cgold2 need DIP 5201-5 enabled to work (if disabled, it acts as a 'freeze' switch).
- - The US games do work as such, however the unemulated items cause the games to end up disabled with the error (most notably, 70 - Printer Fault).
- - These games possibly need a set chip, as it is currently impossible to set up denominations; the machines are stuck in $100 per credit mode, which is a highly unusual setting.
- - If you turn PTRHOM off (with PTRTAC on), this will give you a short amount of time to enter the audit menu, however the games will still lock up with a printer fault.
- To temporarily get around the lockup, keep triggering the main door switch (hit M twice). The machine will keep locking up every 2-3 seconds, however it is usable. If PTRHOM is on, the lockup happens immediately.
- - None of these games can coin up, however they are remotely playable with a memory/NVRAM hack to bypass the printer error and add credits. All of the US games pay out wins as physical coins (to hopper) rather than adding to credits.
- - Arctic Wins is similar to the Black Rhino/White Tiger style games, and Fortune Hunter is a direct clone of 3 Bags Full, even having the second screen feature named the 'Three Bags Full Feature'. Caribbean Gold 2 is a clone of Gone Troppo.
+ 3. arcwins, eforest, fhunter, fhuntera and cgold2 do not work (these US-based games require note acceptor and printer support).
+ - fhunter, fhuntera and cgold2 need DIP 5201-5 enabled to work (if disabled, it acts as a 'freeze' switch).
+ - The US games do work as such, however the unemulated items cause the games to end up disabled with the error (most notably, 70 - Printer Fault).
+ - These games possibly need a set chip, as it is currently impossible to set up denominations; the machines are stuck in $100 per credit mode, which is a highly unusual setting.
+ - If you turn PTRHOM off (with PTRTAC on), this will give you a short amount of time to enter the audit menu, however the games will still lock up with a printer fault.
+ To temporarily get around the lockup, keep triggering the main door switch (hit M twice). The machine will keep locking up every 2-3 seconds, however it is usable. If PTRHOM is on, the lockup happens immediately.
+ - None of these games can coin up, however they are remotely playable with a memory/NVRAM hack to bypass the printer error and add credits. All of the US games pay out wins as physical coins (to hopper) rather than adding to credits.
+ - Arctic Wins is similar to the Black Rhino/White Tiger style games, and Fortune Hunter is a direct clone of 3 Bags Full, even having the second screen feature named the 'Three Bags Full Feature'. Caribbean Gold 2 is a clone of Gone Troppo.
- 4. ROMs need redumping for the following games:
- - White Tiger has bad graphics ROMs.
- - Clockwise needs its program ROM redumped, original dump was 32K of 0xFF's. Graphics and video/sound ROM are OK.
- - Correct PROMs needed for Top Gear (2CM33), Caribbean Gold 2 (unknown), Clockwise (2CM18) and Golden Poker (unknown).
+ 4. ROMs need redumping for the following games:
+ - White Tiger has bad graphics ROMs.
+ - Clockwise needs its program ROM redumped, original dump was 32K of 0xFF's. Graphics and video/sound ROM are OK.
+ - Correct PROMs needed for Top Gear (2CM33), Caribbean Gold 2 (unknown), Clockwise (2CM18) and Golden Poker (unknown).
- 5.Add note acceptor support
+ 5.Add note acceptor support
- 6.Provide complete cashcade emulation
+ 6.Provide complete cashcade emulation
- 7.Look into what the hopper probe signal is for.
+ 7.Look into what the hopper probe signal is for.
- 8.Investigate issues with the Poker style games as described below.
+ 8.Investigate issues with the Poker style games as described below.
- 9.When DIP SW7 is set to off/off, speed is dramatically reduced.
+ 9.When DIP SW7 is set to off/off, speed is dramatically reduced.
- 10. rewrite video emulation by using custom drawing code.
+ 10. rewrite video emulation by using custom drawing code.
- 11. check what type of mc6845 this HW uses on real PCB, and hook it up properly.
+ 11. check what type of mc6845 this HW uses on real PCB, and hook it up properly.
- 12. fix 86 Lions (pre-Aristocrat Mk-4 HW, without prom and dunno what else)
+ 12. fix 86 Lions (pre-Aristocrat Mk-4 HW, without prom and dunno what else)
- ***************** POKER GAMES ************************************************************************
+ ***************** POKER GAMES ************************************************************************
- Wild One & Golden Poker have a problem where the second branch condition is always true, see assebler below for
- example of Wild One.
+ Wild One & Golden Poker have a problem where the second branch condition is always true, see assebler below for
+ example of Wild One.
- 907D BITA $1800 ( crtc )
- 9080 BNE $907D ; is zero
- 9082 BITA $1800
- 9085 BEQ $9082 ; branches to 9082 indefinately, value is always zero.
- 9087 LDA #$40
+ 907D BITA $1800 ( crtc )
+ 9080 BNE $907D ; is zero
+ 9082 BITA $1800
+ 9085 BEQ $9082 ; branches to 9082 indefinately, value is always zero.
+ 9087 LDA #$40
- If the PC ( program counter ) is set to 9087 then the game runs.
+ If the PC ( program counter ) is set to 9087 then the game runs.
- Bug in the 6845 crtc core ? Seems like some kind of logic there not working.
+ Bug in the 6845 crtc core ? Seems like some kind of logic there not working.
- EDIT: it's a vblank check, BITA opcode checks bit 5 in A register and compares it with the contents of 0x1800 (that is vblank in
- mc6845_status_r). Checking if a bit goes low then high it usually means that is moaning for a vblank. ;-)
- But now there is a new question: what kind of mc6845 clone this HW uses? It's clearly not standard mc6845, since that version doesn't
- support vblank reading. The vblank bit can be read only on C6545-1, R6545-1, SY6545-1 and SY6845E subvariants, so it all lies to
- those. -AS
+ EDIT: it's a vblank check, BITA opcode checks bit 5 in A register and compares it with the contents of 0x1800 (that is vblank in
+ mc6845_status_r). Checking if a bit goes low then high it usually means that is moaning for a vblank. ;-)
+ But now there is a new question: what kind of mc6845 clone this HW uses? It's clearly not standard mc6845, since that version doesn't
+ support vblank reading. The vblank bit can be read only on C6545-1, R6545-1, SY6545-1 and SY6845E subvariants, so it all lies to
+ those. -AS
***********************************************************************************************************************************************/
@@ -269,10 +269,10 @@ INLINE void uBackgroundColour(running_machine &machine)
aristmk4_state *state = machine.driver_data<aristmk4_state>();
/* SW7 can be set when the main door is open, this allows the colours for the background
- to be adjusted whilst the machine is running.
+ to be adjusted whilst the machine is running.
- There are 4 possible combinations for colour select via SW7, colours vary based on software installed.
- */
+ There are 4 possible combinations for colour select via SW7, colours vary based on software installed.
+ */
switch(input_port_read(machine, "SW7"))
{
@@ -1359,11 +1359,11 @@ static WRITE8_DEVICE_HANDLER(firq)
static const via6522_interface via_interface =
{
- /*inputs : A/B */ DEVCB_HANDLER(via_a_r),DEVCB_HANDLER(via_b_r),
- /*inputs : CA/B1,CA/B2 */ DEVCB_NULL,DEVCB_NULL,DEVCB_HANDLER(via_ca2_r),DEVCB_HANDLER(via_cb2_r),
- /*outputs: A/B */ DEVCB_HANDLER(via_a_w), DEVCB_HANDLER(via_b_w),
- /*outputs: CA/B1,CA/B2 */ DEVCB_NULL,DEVCB_NULL,DEVCB_HANDLER(via_ca2_w),DEVCB_HANDLER(via_cb2_w),
- /*irq */ DEVCB_HANDLER(firq)
+ /*inputs : A/B */ DEVCB_HANDLER(via_a_r),DEVCB_HANDLER(via_b_r),
+ /*inputs : CA/B1,CA/B2 */ DEVCB_NULL,DEVCB_NULL,DEVCB_HANDLER(via_ca2_r),DEVCB_HANDLER(via_cb2_r),
+ /*outputs: A/B */ DEVCB_HANDLER(via_a_w), DEVCB_HANDLER(via_b_w),
+ /*outputs: CA/B1,CA/B2 */ DEVCB_NULL,DEVCB_NULL,DEVCB_HANDLER(via_ca2_w),DEVCB_HANDLER(via_cb2_w),
+ /*irq */ DEVCB_HANDLER(firq)
// CA1 is connected to +5V, CB1 is not connected.
};
@@ -1387,7 +1387,7 @@ static const pia6821_interface aristmk4_pia1_intf =
static const mc6845_interface mc6845_intf =
{
/* in fact is a mc6845 driving 4 pixels by memory address.
- that's why the big horizontal parameters */
+ that's why the big horizontal parameters */
"screen", /* screen we are acting on */
4, /* number of pixels per video memory address */
@@ -1487,20 +1487,20 @@ static MACHINE_RESET( aristmk4 )
static TIMER_DEVICE_CALLBACK( aristmk4_pf )
{
/*
- IRQ generator pulses the NMI signal to CPU in the event of power down or power failure.
- This event is recorded in NVRAM to facilitate the Robot Test.
+ IRQ generator pulses the NMI signal to CPU in the event of power down or power failure.
+ This event is recorded in NVRAM to facilitate the Robot Test.
- Would be ideal to use this in our add_exit_callback instead of using a timer but it doesn't seem to
- save the power down state in nvram. Is there a cleaner way to do this?
+ Would be ideal to use this in our add_exit_callback instead of using a timer but it doesn't seem to
+ save the power down state in nvram. Is there a cleaner way to do this?
- To enter the robot test
+ To enter the robot test
- 1. Open the main door
- 2. Trigger powerfail / NMI by presing L for at least 1 second, the game will freeze.
- 3. Press F3 ( reset ) whilst holding down robot/hopper test button ( Z )
+ 1. Open the main door
+ 2. Trigger powerfail / NMI by presing L for at least 1 second, the game will freeze.
+ 3. Press F3 ( reset ) whilst holding down robot/hopper test button ( Z )
- Note: The use of 1 Hz in the timer is to avoid unintentional triggering the NMI ( ie.. hold down L for at least 1 second )
- */
+ Note: The use of 1 Hz in the timer is to avoid unintentional triggering the NMI ( ie.. hold down L for at least 1 second )
+ */
if(input_port_read(timer.machine(), "powerfail")) // send NMI signal if L pressed
{
@@ -2161,7 +2161,7 @@ ROM_END
GAMEL( 1985, 86lions, 0, 86lions, aristmk4, aristmk4, ROT0, "Aristocrat", "86 Lions", GAME_NOT_WORKING, layout_topgear )
GAMEL( 1996, eforest, 0, aristmk4, eforest, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (12XF528902, US)", GAME_NOT_WORKING, layout_eforest ) // multiple denominations
-GAMEL( 1995, eforesta, eforest, aristmk4, aristmk4, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (4VXFC818, NSW)", 0, layout_aristmk4 ) // 10c, $1 = 10 credits
+GAMEL( 1995, eforesta, eforest, aristmk4, aristmk4, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (4VXFC818, NSW)", 0, layout_aristmk4 ) // 10c, $1 = 10 credits
GAMEL( 1996, eforestb, eforest, aristmk4, arimk4nz, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (3VXFC5343, New Zealand)", 0, layout_arimk4nz ) // 5c, $2 = 40 credits
GAMEL( 1996, 3bagflvt, 0, aristmk4, 3bagflvt, aristmk4, ROT0, "Aristocrat", "3 Bags Full (5VXFC790, Victoria)", 0, layout_3bagflvt ) // 5c, $1 = 20 credits
GAMEL( 1996, 3bagflnz, 3bagflvt, aristmk4, 3bagflnz, aristmk4, ROT0, "Aristocrat", "3 Bags Full (3VXFC5345, New Zealand)", 0, layout_3bagflnz ) // 5c, $2 = 40 credits
diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c
index fee3920df06..0b35a943915 100644
--- a/src/mame/drivers/cdi.c
+++ b/src/mame/drivers/cdi.c
@@ -351,7 +351,7 @@ struct cdrom_interface cdi_cdrom =
static MACHINE_CONFIG_DERIVED( cdimono1, cdi )
MCFG_MACHINE_RESET( cdi )
- MCFG_CDROM_ADD( "cdrom", cdi_cdrom )
+ MCFG_CDROM_ADD( "cdrom", cdi_cdrom )
MCFG_SOFTWARE_LIST_ADD("cd_list","cdi")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index fca8ed7c0b3..f617a8a8d12 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -935,8 +935,8 @@ ROM_START( donghaer )
ROM_LOAD("donghaer_pic16f84a.bin", 0x000000, 0x4280, NO_DUMP )
ROM_REGION32_LE( 0x2000000, "user1", 0 ) // Flash
- ROM_LOAD( "u1", 0x0000000, 0x1000000, CRC(61217ad7) SHA1(2593f1356aa850f4f9aa5d00bec822aa59c59224) )
- ROM_LOAD( "u2", 0x1000000, 0x1000000, CRC(6d82f1a5) SHA1(036bd45f0daac1ffeaa5ad9774fc1b56e3c75ff9) )
+ ROM_LOAD( "u1", 0x0000000, 0x1000000, CRC(61217ad7) SHA1(2593f1356aa850f4f9aa5d00bec822aa59c59224) )
+ ROM_LOAD( "u2", 0x1000000, 0x1000000, CRC(6d82f1a5) SHA1(036bd45f0daac1ffeaa5ad9774fc1b56e3c75ff9) )
ROM_REGION( 0x10000, "user2", ROMREGION_ERASEFF ) //Unmapped flash
ROM_END
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index a84df411905..033c3c4ad4d 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -1055,7 +1055,7 @@ static READ8_DEVICE_HANDLER( hopper_b_r )
jpmimpct_state *state = device->machine().driver_data<jpmimpct_state>();
int retval;
- // B0 = 1 Hopper Out Verif
+ // B0 = ?1 Hopper Out Verif
// B1 = Hopper High
// B2 = Hopper Low
// B3 = 20p Hopper Opto
@@ -1087,7 +1087,7 @@ static READ8_DEVICE_HANDLER( hopper_c_r )
// C3
// C4 = 20p Hopper Detect
// C5 = Hopper Top-Up
- // C6 = 1 Hopper Detect
+ // C6 = ?1 Hopper Detect
// C7 = Payout Verif (Slides)
retval=0xf0; //1111 0000
@@ -1414,14 +1414,14 @@ static ADDRESS_MAP_START( awp68k_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x00480084, 0x00480085) AM_DEVREAD("upd", upd7759_r)
AM_RANGE(0x00480086, 0x0048009f) AM_READ(prot_1_r)
AM_RANGE(0x004800a0, 0x004800af) AM_READWRITE(jpmio_r, jpmioawp_w)
-// AM_RANGE(0x004800b0, 0x004800df) AM_READ(prot_1_r)
-// AM_RANGE(0x004800e0, 0x004800e1) AM_WRITE(unk_w)
-// AM_RANGE(0x00480086, 0x006576ff) AM_READ(prot_1_r)
+// AM_RANGE(0x004800b0, 0x004800df) AM_READ(prot_1_r)
+// AM_RANGE(0x004800e0, 0x004800e1) AM_WRITE(unk_w)
+// AM_RANGE(0x00480086, 0x006576ff) AM_READ(prot_1_r)
AM_RANGE(0x004801dc, 0x004801dd) AM_READ(prot_1_r)
-// AM_RANGE(0x004801dc, 0x004801dd) AM_READ(unk_r)
-// AM_RANGE(0x004801de, 0x004801df) AM_READ(unk_r)
-// AM_RANGE(0x00657600, 0x00657601) AM_READ(prot_0_r)
+// AM_RANGE(0x004801dc, 0x004801dd) AM_READ(unk_r)
+// AM_RANGE(0x004801de, 0x004801df) AM_READ(unk_r)
+// AM_RANGE(0x00657600, 0x00657601) AM_READ(prot_0_r)
//AM_RANGE(0x00657602, 0x00bfffff) AM_READ(prot_1_r)
// AM_RANGE(0x004801e0, 0x004801ff) AM_READWRITE(duart_2_r, duart_2_w)
AM_RANGE(0x00c00000, 0x00cfffff) AM_ROM
@@ -1501,7 +1501,7 @@ static INPUT_PORTS_START( tbirds )
PORT_CONFSETTING( 0x40, "20p" )
PORT_CONFSETTING( 0xC0, "25p" )
PORT_CONFSETTING( 0x20, "30p" )
-// PORT_CONFSETTING( 0x20, "40p" )
+// PORT_CONFSETTING( 0x20, "40p" )
PORT_CONFSETTING( 0x60, "50p" )
PORT_CONFSETTING( 0xE0, "1 GBP" )
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 4494044ee35..788d8d454b3 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -5,9 +5,9 @@
This driver holds all the mechanical games.
06-2011: Fixed boneheaded interface glitch that was causing samples to not be cancelled correctly.
- Added the ability to read each segment of an LED display separately, this may be necessary for some
- games that use them as surrogate lamp lines.
- New persistence 'hack' to stop light flicker for the small extender.
+ Added the ability to read each segment of an LED display separately, this may be necessary for some
+ games that use them as surrogate lamp lines.
+ New persistence 'hack' to stop light flicker for the small extender.
05-2011: Add better OKI emulation
04-2011: More accurate gamball code, fixed ROM banking (Project Amber), added BwB CHR simulator (Amber)
This is still a hard coded system, but significantly different to Barcrest's version.
@@ -220,7 +220,7 @@ TODO: - Distinguish door switches using manual
- It seems that the MPU4 core program relies on some degree of persistence when switching strobes and handling
writes to the various hardware ports. This explains the occasional lamping/LED blackout and switching bugs
For now, we're ignoring any extra writes to strobes, as the alternative is to assign a timer to *everything* and
- start modelling the individual hysteresis curves of filament lamps.
+ start modelling the individual hysteresis curves of filament lamps.
- Fix BwB characteriser, need to be able to calculate stabiliser bytes. Anyone fancy reading 6809 source?
- Strange bug in Andy's Great Escape - Mystery nudge sound effect is not played, mpu4 latches in silence instead (?)
***********************************************************************************************************/
@@ -1822,10 +1822,10 @@ static WRITE8_HANDLER( ic3ss_w )
float num = (1720000/((state->m_t3l + 1)*(state->m_t3h + 1)));
float denom1 = ((state->m_t3h *(state->m_t3l + 1)+ 1)/(2*(state->m_t1 + 1)));
-
+
int denom2 = denom1 +0.5;//need to round up, this gives same precision as chip
- int freq=num*denom2;
-
+ int freq=num*denom2;
+
if (freq)
{
okim6376_set_frequency(msm6376, freq);
@@ -3008,7 +3008,7 @@ static ADDRESS_MAP_START( mpu4_bwb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0878, 0x0878) AM_WRITE(bankset_w) // write bank (rom page select)
AM_RANGE(0x0880, 0x0883) AM_DEVREADWRITE_MODERN("pia_ic4ss", pia6821_device, read, write) // PIA6821 on sampled sound board
-// AM_RANGE(0x08c0, 0x08c7) AM_DEVREADWRITE_MODERN("ptm_ic3ss", ptm6840_device, read, write) // 6840PTM on sampled sound board
+// AM_RANGE(0x08c0, 0x08c7) AM_DEVREADWRITE_MODERN("ptm_ic3ss", ptm6840_device, read, write) // 6840PTM on sampled sound board
AM_RANGE(0x08c0, 0x08c7) AM_DEVREAD_MODERN("ptm_ic3ss", ptm6840_device, read) // 6840PTM on sampled sound board
AM_RANGE(0x08c0, 0x08c7) AM_WRITE(ic3ss_w) // 6840PTM on sampled sound board
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 1945d8a0c72..0254b8bc8ac 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -166,7 +166,7 @@ timer driven, the video is capable of various raster effects etc.)
TODO:
- Correctly implement characteriser protection for each game.
- Mating Game animation and screen still slower than it should be, AVDC timing/IRQs?
- - Get the BwB games running
+ - Get the BwB games running
* They have a slightly different 68k memory map. The 6850 is at e00000 and the 6840 is at e01000
They appear to hang on the handshake with the MPU4 board
- Find out what causes the games to reset in service mode (see jump taken at CPU1:c8e8)
@@ -1226,10 +1226,10 @@ static WRITE8_HANDLER( ic3ss_vid_w )
float num = ((VIDEO_MASTER_CLOCK / 10)/((state->m_t3l + 1)*(state->m_t3h + 1)));
float denom1 = ((state->m_t3h *(state->m_t3l + 1)+ 1)/(2*(state->m_t1 + 1)));
-
+
int denom2 = denom1 +0.5;//need to round up, this gives same precision as chip
- int freq=num*denom2;
-
+ int freq=num*denom2;
+
if (freq)
{
okim6376_set_frequency(msm6376, freq);
@@ -2403,7 +2403,7 @@ static MACHINE_CONFIG_START( mpu4_vid, mpu4_state )
MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK )
MCFG_CPU_PROGRAM_MAP(mpu4_68k_map)
-// MCFG_QUANTUM_TIME(attotime::from_hz(960))
+// MCFG_QUANTUM_TIME(attotime::from_hz(960))
MCFG_MACHINE_START(mpu4_vid)
MCFG_MACHINE_RESET(mpu4_vid)
diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c
index 6f12bf26cc2..4ec05b4fdc9 100644
--- a/src/mame/drivers/saturn.c
+++ b/src/mame/drivers/saturn.c
@@ -1231,8 +1231,8 @@ static void scu_do_transfer(running_machine &machine,UINT8 event)
{
if(state->m_scu.enable_mask[i] && state->m_scu.start_factor[i] == event)
{
- if(DIRECT_MODE(i)) { scu_dma_direct(space,i); }
- else { scu_dma_indirect(space,i); }
+ if(DIRECT_MODE(i)) { scu_dma_direct(space,i); }
+ else { scu_dma_indirect(space,i); }
}
}
}
@@ -1326,7 +1326,7 @@ static WRITE32_HANDLER( saturn_scu_w )
if(state->m_scu.enable_mask[DMA_CH] && state->m_scu.start_factor[DMA_CH] == 7 && state->m_scu_regs[offset] & 1)
{
if(DIRECT_MODE(DMA_CH)) { scu_dma_direct(space,DMA_CH); }
- else { scu_dma_indirect(space,DMA_CH); }
+ else { scu_dma_indirect(space,DMA_CH); }
state->m_scu_regs[offset]&=~1;//disable starting bit.
}
break;
diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c
index e834c47ea99..31c900a08ee 100644
--- a/src/mame/drivers/vp101.c
+++ b/src/mame/drivers/vp101.c
@@ -96,7 +96,7 @@ ROM_END
ROM_START(specfrce)
ROM_REGION(0x100000, "maincpu", 0) /* Boot ROM */
- ROM_LOAD( "specialforces_boot34.u4", 0x000000, 0x100000, CRC(db4862ac) SHA1(a1e886d424cf7d26605e29d972d48e8d44ae2d58) )
+ ROM_LOAD( "specialforces_boot34.u4", 0x000000, 0x100000, CRC(db4862ac) SHA1(a1e886d424cf7d26605e29d972d48e8d44ae2d58) )
DISK_REGION( "ide" )
DISK_IMAGE_READONLY("sf010101", 0, SHA1(2fc4e02d08163d8ed28b00f590240d550eaa6015) )
diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c
index ec566501a3d..d306b9d830b 100644
--- a/src/mame/drivers/warpsped.c
+++ b/src/mame/drivers/warpsped.c
@@ -6,24 +6,24 @@ Preliminary driver by Mariusz Wojcieszek
Hardware registers:
0x00 - 0x1f control register for discs generator (8 bytes each)
- 0x00, 0x01 disc radius (?)
- 0x02, 0x03 disc middle point
- 0x04, 0x05 disc middle point
- 0x06 disc colour (0-7)
- 0x07 unused
-0x20 ?
-0x21 sound (intro screens have bit 1 toggled for click effect)
-0x22 ?
-0x23 ?
-0x24 ?
-0x25 ?
-0x26 ?
-0x27 ?
+ 0x00, 0x01 disc radius (?)
+ 0x02, 0x03 disc middle point
+ 0x04, 0x05 disc middle point
+ 0x06 disc colour (0-7)
+ 0x07 unused
+0x20 ?
+0x21 sound (intro screens have bit 1 toggled for click effect)
+0x22 ?
+0x23 ?
+0x24 ?
+0x25 ?
+0x26 ?
+0x27 ?
Board etched...
- MEADOWS 024-0084
- MADE IN USA
+ MEADOWS 024-0084
+ MADE IN USA
Empty socket at .E3
Z80 processor
@@ -32,43 +32,43 @@ Z80 processor
5Mhz crystal
All PROMS are SN74s474
-.L18 no sticker
-.L17 stickered L9, L13
- L17, G17
-.L15 stickered L10, L15
- L18, G18
-.L13 stickered L9, L13
- L17, G17
-.L10 stickered L10, L15
- L18, G18
-.L9 stickered (damaged) xxx, L13
- xxx, G1y
-.K1 stickered K1
-.G2 no sticker K1
-.E4 no sticker
-.E5 stickered M16
- PRO
- 1
-.E6 stickered M16
- PRO
- 3
-.C3 can't read
-.C4 stickered M16
- PRO
- 4
-.C5 stickered M16
- PRO
- 0
-.C6 stickered M16
- PRO
- 2
-.E8 stickered E8
-.E10 stickered E10
-.C12 stickered C12
-.G17 stickered L9, L13
- L17, G17
-.G18 stickered L10, L15
- L18, G18
+.L18 no sticker
+.L17 stickered L9, L13
+ L17, G17
+.L15 stickered L10, L15
+ L18, G18
+.L13 stickered L9, L13
+ L17, G17
+.L10 stickered L10, L15
+ L18, G18
+.L9 stickered (damaged) xxx, L13
+ xxx, G1y
+.K1 stickered K1
+.G2 no sticker K1
+.E4 no sticker
+.E5 stickered M16
+ PRO
+ 1
+.E6 stickered M16
+ PRO
+ 3
+.C3 can't read
+.C4 stickered M16
+ PRO
+ 4
+.C5 stickered M16
+ PRO
+ 0
+.C6 stickered M16
+ PRO
+ 2
+.E8 stickered E8
+.E10 stickered E10
+.C12 stickered C12
+.G17 stickered L9, L13
+ L17, G17
+.G18 stickered L10, L15
+ L18, G18
L9, L13, L17 and G17 all read the same
L10, L15, L18 and G18 all read the same
@@ -93,13 +93,13 @@ public:
static READ8_HANDLER( warpspeed_hardware_r )
{
-// warpspeed_state *state = space->machine().driver_data<warpspeed_state>();
+// warpspeed_state *state = space->machine().driver_data<warpspeed_state>();
switch( offset )
{
case 0: return input_port_read(space->machine(), "IN1" );
/* dipswitches? bit 6 when set causes jump to $e01 during vblank (rom missing) is this test mode? */
- case 2: return 0;
+ case 2: return 0;
case 3: return input_port_read(space->machine(), "IN0" );
}
return 0;
diff --git a/src/mame/layout/3bagflnz.lay b/src/mame/layout/3bagflnz.lay
index f138811bb7c..ee673461eeb 100644
--- a/src/mame/layout/3bagflnz.lay
+++ b/src/mame/layout/3bagflnz.lay
@@ -103,7 +103,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -116,7 +116,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -129,7 +129,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -142,7 +142,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -155,7 +155,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -168,7 +168,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -181,7 +181,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -194,7 +194,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -256,14 +256,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="bet4">
+ <bezel name="lamp12" element="bet4">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="bet5">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp10" element="reserve">
<bounds x="0.67" y="3.28" width="0.31" height="0.24" />
</bezel>
@@ -271,46 +271,46 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="3 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="5 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="7 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="9 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/3bagflvt.lay b/src/mame/layout/3bagflvt.lay
index 81931f31fad..007947e58f1 100644
--- a/src/mame/layout/3bagflvt.lay
+++ b/src/mame/layout/3bagflvt.lay
@@ -84,7 +84,7 @@
</rect>
<rect state="0">
<color red="0.5" green="0.5" blue="0.5" />
-
+
</rect>
<text string="MAX BET">
<color red="0.0" green="0.0" blue="0.0" />
@@ -117,7 +117,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -130,7 +130,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -143,7 +143,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -156,7 +156,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -169,7 +169,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="auto play">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="bet5">
+ <bezel name="lamp12" element="bet5">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="bet10">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="max bet">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="3 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="5 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="7 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="9 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="auto play">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/arcwins.lay b/src/mame/layout/arcwins.lay
index 7b4d81006d2..13b78234a22 100644
--- a/src/mame/layout/arcwins.lay
+++ b/src/mame/layout/arcwins.lay
@@ -25,7 +25,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="2 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -38,7 +38,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -51,7 +51,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="4 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -64,7 +64,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -77,14 +77,14 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="gamble">
<rect state="1">
<color red="0.5" green="0.0" blue="0.7" />
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="GAMBLE">
<color red="0.0" green="0.0" blue="0.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="4 lines">
+ <bezel name="lamp12" element="4 lines">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="5 lines">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="gamble">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="bet1">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="bet2">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="bet3">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="bet4">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="bet5">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="take win">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/arimk4nz.lay b/src/mame/layout/arimk4nz.lay
index f09e5382815..068827fac0c 100644
--- a/src/mame/layout/arimk4nz.lay
+++ b/src/mame/layout/arimk4nz.lay
@@ -84,7 +84,7 @@
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="DOUBLE UP">
<color red="0.0" green="0.0" blue="0.0" />
@@ -117,7 +117,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -130,7 +130,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -143,7 +143,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -156,7 +156,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -169,7 +169,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="take win">
<rect state="1">
<color red="1.0" green="0.7" blue="0.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="bet4">
+ <bezel name="lamp12" element="bet4">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="bet5">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="double up">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="3 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="5 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="7 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="9 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="take win">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/aristmk4.lay b/src/mame/layout/aristmk4.lay
index da67096c275..b4310a6fbef 100644
--- a/src/mame/layout/aristmk4.lay
+++ b/src/mame/layout/aristmk4.lay
@@ -84,7 +84,7 @@
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="GAMBLE">
<color red="0.0" green="0.0" blue="0.0" />
@@ -117,7 +117,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -130,7 +130,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -143,7 +143,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -156,7 +156,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -169,7 +169,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="take win">
<rect state="1">
<color red="1.0" green="0.7" blue="0.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="bet5">
+ <bezel name="lamp12" element="bet5">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="bet10">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="gamble">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="3 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="5 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="7 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="9 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="take win">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/cgold2.lay b/src/mame/layout/cgold2.lay
index 4dc0b1e702f..e69675aace4 100644
--- a/src/mame/layout/cgold2.lay
+++ b/src/mame/layout/cgold2.lay
@@ -25,7 +25,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="2 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -38,7 +38,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -51,7 +51,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="4 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -64,7 +64,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -77,7 +77,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="service">
<rect state="1">
<color red="0.0" green="1.0" blue="0.0" />
@@ -168,7 +168,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -181,7 +181,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -194,7 +194,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -256,14 +256,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="4 lines">
+ <bezel name="lamp12" element="4 lines">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="5 lines">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp10" element="service">
<bounds x="0.67" y="3.28" width="0.31" height="0.24" />
</bezel>
@@ -271,46 +271,46 @@
<bezel name="lamp1" element="bet1">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="bet2">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="bet3">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="bet4">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="bet5">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/eforest.lay b/src/mame/layout/eforest.lay
index 8350071491b..b687aba865f 100644
--- a/src/mame/layout/eforest.lay
+++ b/src/mame/layout/eforest.lay
@@ -25,7 +25,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -38,7 +38,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -51,7 +51,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -64,7 +64,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -77,14 +77,14 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="gamble">
<rect state="1">
<color red="0.5" green="0.0" blue="0.7" />
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="GAMBLE">
<color red="0.0" green="0.0" blue="0.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="7 lines">
+ <bezel name="lamp12" element="7 lines">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="9 lines">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="gamble">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="bet1">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="bet2">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="bet3">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="bet4">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="bet5">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="take win">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/fhunter.lay b/src/mame/layout/fhunter.lay
index 87915ab20a0..19eebcd5431 100644
--- a/src/mame/layout/fhunter.lay
+++ b/src/mame/layout/fhunter.lay
@@ -25,7 +25,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -38,7 +38,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -51,7 +51,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -64,7 +64,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -77,7 +77,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="service">
<rect state="1">
<color red="0.0" green="1.0" blue="0.0" />
@@ -168,7 +168,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -181,7 +181,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -194,7 +194,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -256,14 +256,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="7 lines">
+ <bezel name="lamp12" element="7 lines">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="9 lines">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp10" element="service">
<bounds x="0.67" y="3.28" width="0.31" height="0.24" />
</bezel>
@@ -271,46 +271,46 @@
<bezel name="lamp1" element="bet1">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="bet2">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="bet3">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="bet4">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="bet5">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/gldnpkr.lay b/src/mame/layout/gldnpkr.lay
index f90731708b0..299680dfd00 100644
--- a/src/mame/layout/gldnpkr.lay
+++ b/src/mame/layout/gldnpkr.lay
@@ -45,7 +45,7 @@
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="DOUBLE UP">
<color red="0.0" green="0.0" blue="0.0" />
@@ -257,7 +257,7 @@
<bezel name="lamp10" element="hold3">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="hold4">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
diff --git a/src/mame/layout/goldenc.lay b/src/mame/layout/goldenc.lay
index d9b01555e16..c309a7137f1 100644
--- a/src/mame/layout/goldenc.lay
+++ b/src/mame/layout/goldenc.lay
@@ -84,7 +84,7 @@
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="DOUBLE UP">
<color red="0.0" green="0.0" blue="0.0" />
@@ -117,7 +117,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -130,7 +130,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -143,7 +143,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="7 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -156,7 +156,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="9 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -169,7 +169,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="take win">
<rect state="1">
<color red="1.0" green="0.7" blue="0.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="bet5">
+ <bezel name="lamp12" element="bet5">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="bet10">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="double up">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="3 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="5 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="7 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="9 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="take win">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/kgbird.lay b/src/mame/layout/kgbird.lay
index 042ed5ce7a0..8e0c4706d79 100644
--- a/src/mame/layout/kgbird.lay
+++ b/src/mame/layout/kgbird.lay
@@ -84,7 +84,7 @@
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="DOUBLE UP">
<color red="0.0" green="0.0" blue="0.0" />
@@ -117,7 +117,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="2 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -130,7 +130,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -143,7 +143,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="4 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -156,7 +156,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -169,7 +169,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="take win">
<rect state="1">
<color red="1.0" green="0.7" blue="0.0" />
@@ -182,7 +182,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -195,7 +195,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -208,7 +208,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -221,7 +221,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -235,7 +235,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -283,14 +283,14 @@
<bounds x="1.91" y="3.02" width="0.31" height="0.24" />
</bezel>
- <bezel name="lamp12" element="bet4">
+ <bezel name="lamp12" element="bet4">
<bounds x="2.31" y="3.02" width="0.31" height="0.24" />
</bezel>
<bezel name="lamp7" element="bet5">
<bounds x="2.72" y="3.02" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp18" element="double up">
<bounds x="3.13" y="3.02" width="0.31" height="0.24" />
</bezel>
@@ -302,50 +302,50 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="2 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="3 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="4 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="5 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp13" element="take win">
<bounds x="3.13" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/topgear.lay b/src/mame/layout/topgear.lay
index 479527a4e58..8fe1664fa44 100644
--- a/src/mame/layout/topgear.lay
+++ b/src/mame/layout/topgear.lay
@@ -51,7 +51,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="2 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -64,7 +64,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="3 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -77,7 +77,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="4 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -90,7 +90,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="5 lines">
<rect state="1">
<color red="1.0" green="1.0" blue="1.0" />
@@ -103,7 +103,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower1">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -116,7 +116,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower2">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -129,7 +129,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower3">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -142,7 +142,7 @@
<bounds x="0" y="0.1" width="1" height="0.8" />
</text>
</element>
-
+
<element name="light tower4">
<disk state="1">
<color red="1.0" green="0.0" blue="0.0" />
@@ -156,7 +156,7 @@
</text>
</element>
-
+
<element name="auditkey">
<rect state="1">
<color red="0.5" green="0.35" blue="0.0" />
@@ -203,46 +203,46 @@
<bezel name="lamp1" element="1 line">
<bounds x="1.08" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp2" element="2 lines">
<bounds x="1.49" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp3" element="3 lines">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="4 lines">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp4" element="5 lines">
<bounds x="2.72" y="3.28" width="0.31" height="0.24" />
</bezel>
-
+
<bezel name="lamp14" element="light tower1">
<bounds x="3.70" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp15" element="light tower2">
<bounds x="3.80" y="3.28" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp16" element="light tower3">
<bounds x="3.70" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp17" element="light tower4">
<bounds x="3.80" y="3.38" width="0.10" height="0.10" />
</bezel>
-
+
<bezel name="lamp19" element="auditkey">
<bounds x="0.26" y="3.09" width="0.31" height="0.12" />
</bezel>
-
+
<bezel name="lamp20" element="jackpotkey">
<bounds x="0.26" y="3.34" width="0.31" height="0.12" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/layout/wildone.lay b/src/mame/layout/wildone.lay
index d7d5059b2ae..541e3184f6d 100644
--- a/src/mame/layout/wildone.lay
+++ b/src/mame/layout/wildone.lay
@@ -58,7 +58,7 @@
</rect>
<rect state="0">
<color red="0.25" green="0.0" blue="0.35" />
-
+
</rect>
<text string="DOUBLE UP">
<color red="0.0" green="0.0" blue="0.0" />
@@ -274,7 +274,7 @@
<bezel name="lamp10" element="hold3">
<bounds x="1.91" y="3.28" width="0.31" height="0.24" />
- </bezel>
+ </bezel>
<bezel name="lamp9" element="hold4">
<bounds x="2.31" y="3.28" width="0.31" height="0.24" />
diff --git a/src/mame/machine/naomim4decoder.c b/src/mame/machine/naomim4decoder.c
index 90a39be3c4f..0bcc7f5dd95 100755
--- a/src/mame/machine/naomim4decoder.c
+++ b/src/mame/machine/naomim4decoder.c
@@ -12,7 +12,7 @@ NaomiM4Decoder::NaomiM4Decoder(UINT32 cart_key)
, m_iv(cart_key >> 16) // initialization vector
{
m_one_round = global_alloc_array(UINT16,0x10000);
-
+
// populate the lookup table for one of the internal rounds of the cipher
for (UINT32 i=0; i<0x10000; ++i)
{
@@ -34,11 +34,11 @@ UINT16 NaomiM4Decoder::decrypt(UINT16 ciphertext) // decrypt the next 1
{
if (0 == (m_counter++ & 0xf)) // the iv is recovered every 16 values (32 bytes)
m_middle_value = m_iv;
-
+
UINT16 output_whitening = m_key ^ m_middle_value;
-
+
m_middle_value = m_one_round[ciphertext ^ m_middle_value];
-
+
return m_one_round[m_middle_value ^ m_key] ^ output_whitening;
}
@@ -50,13 +50,13 @@ UINT16 NaomiM4Decoder::one_round_core(UINT16 round_input)
UINT8 nibble_idx;
UINT8 i;
UINT16 result;
-
+
for (nibble_idx = 0; nibble_idx < 4; ++nibble_idx, round_input >>= 4)
{
input_nibble[nibble_idx] = round_input & 0xf;
output_nibble[nibble_idx] = 0;
}
-
+
aux_nibble = input_nibble[3];
for (nibble_idx = 0; nibble_idx < 4; ++nibble_idx) // 4 s-boxes per round
{
@@ -64,10 +64,10 @@ UINT16 NaomiM4Decoder::one_round_core(UINT16 round_input)
for (i = 0; i < 4; ++i) // diffusion of the bits
output_nibble[(nibble_idx - i) & 3] |= aux_nibble & (1 << i);
}
-
+
for (nibble_idx = 0, result = 0; nibble_idx < 4; ++nibble_idx)
result |= (output_nibble[nibble_idx] << (4 * nibble_idx));
-
+
return result;
}
diff --git a/src/mame/machine/naomim4decoder.h b/src/mame/machine/naomim4decoder.h
index 873f5004e78..6407a9da203 100755
--- a/src/mame/machine/naomim4decoder.h
+++ b/src/mame/machine/naomim4decoder.h
@@ -7,9 +7,9 @@
// Decoder for M4-type NAOMI cart encryption
-// In hardware, the decryption is managed by the XC3S50 Xilinx Spartan FPGA (IC2)
-// and the annexed PIC16C621A PIC MCU (IC3).
-// - The FPGA control the clock line of the security PIC.
+// In hardware, the decryption is managed by the XC3S50 Xilinx Spartan FPGA (IC2)
+// and the annexed PIC16C621A PIC MCU (IC3).
+// - The FPGA control the clock line of the security PIC.
// - The protocol between the FPGA and the MCU is nibble-based, though it hasn't been RE for now.
// - The decryption algorithm is clearly nibble-based too.
@@ -28,13 +28,13 @@ class NaomiM4Decoder
public:
NaomiM4Decoder(UINT32 cart_key);
~NaomiM4Decoder();
-
+
void init(); // initialize the decryption of a new stream (set the IV)
UINT16 decrypt(UINT16 ciphertext); // decrypt the next 16-bits value in the stream
-
+
private:
UINT16 one_round_core(UINT16 round_input);
-
+
static const UINT8 k_sboxes[4][16];
UINT16 *m_one_round;
const UINT16 m_key;
diff --git a/src/mame/machine/stvcd.c b/src/mame/machine/stvcd.c
index 613d73dfba6..ef585f83d92 100644
--- a/src/mame/machine/stvcd.c
+++ b/src/mame/machine/stvcd.c
@@ -805,8 +805,8 @@ static void cd_writeWord(running_machine &machine, UINT32 addr, UINT16 data)
}
//else
//{
- // sector_timer->reset();
- // sector_timer->adjust(attotime::from_hz(CD_SPEED)); // 150 sectors / second = 300kBytes/second
+ // sector_timer->reset();
+ // sector_timer->adjust(attotime::from_hz(CD_SPEED)); // 150 sectors / second = 300kBytes/second
//}
break;
@@ -1333,7 +1333,7 @@ static void cd_writeWord(running_machine &machine, UINT32 addr, UINT16 data)
if(temp == 0xfffff8) /* TODO: Falcom Classics */
temp = 0;
#endif
- //cr2 = 0x4101; // CTRL/track
+ //cr2 = 0x4101; // CTRL/track
//cr3 = (curdir[temp].firstfad>>16)&0xff;
//cr4 = (curdir[temp].firstfad&0xffff);
cr_standard_return(cd_stat);
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index cba36c9037e..848a46561ec 100644
--- a/src/mame/machine/stvprot.c
+++ b/src/mame/machine/stvprot.c
@@ -538,7 +538,7 @@ static READ32_HANDLER( decathlt_prot_r )
if (offset==2)
{
UINT32 retvalue;
-
+
retvalue = ROM[(decathlt_protregs[0]*2)-2]; decathlt_protregs[0]++;
retvalue <<= 8;
retvalue |= ROM[(decathlt_protregs[0]*2)+1-2];
@@ -547,7 +547,7 @@ static READ32_HANDLER( decathlt_prot_r )
retvalue <<= 8;
retvalue |= ROM[(decathlt_protregs[0]*2)+1-2];
-
+
decathlt_lastcount++;
logerror("blah_r %08x\n", retvalue);
return retvalue;
@@ -581,19 +581,19 @@ void write_prot_data(UINT32 data, UINT32 mem_mask, int offset, int which)
{
if (data == 0x80000000)
{
- // logerror("changed to upload mode 1\n");
+ // logerror("changed to upload mode 1\n");
decathlt_prot_uploadmode = 1;
decathlt_prot_uploadoffset = 0;
}
else if (data == 0x80800000)
{
- // logerror("changed to upload mode 2\n");
+ // logerror("changed to upload mode 2\n");
decathlt_prot_uploadmode = 2;
decathlt_prot_uploadoffset = 0;
}
else
{
- // logerror("unknown upload mode\n");
+ // logerror("unknown upload mode\n");
decathlt_prot_uploadmode = 2;
decathlt_prot_uploadoffset = 0;
}
@@ -606,7 +606,7 @@ void write_prot_data(UINT32 data, UINT32 mem_mask, int offset, int which)
{
if (decathlt_prot_uploadoffset>=24)
{
- // logerror("upload mode 1 error, too big\n");
+ // logerror("upload mode 1 error, too big\n");
return;
}
@@ -620,7 +620,7 @@ void write_prot_data(UINT32 data, UINT32 mem_mask, int offset, int which)
uploaded values appear to be 12-bit, some are repeated
*/
-
+
{
FILE* fp;
@@ -649,7 +649,7 @@ void write_prot_data(UINT32 data, UINT32 mem_mask, int offset, int which)
{
/* the table uploaded here is a 256 byte table with 256 unique values, remaps something? */
-
+
{
FILE* fp;
if (which==1) fp = fopen("table2x","wb");
@@ -664,14 +664,14 @@ void write_prot_data(UINT32 data, UINT32 mem_mask, int offset, int which)
}
else
{
- // logerror("unknown upload mode!\n");
+ // logerror("unknown upload mode!\n");
}
}
}
if (offset>1)
{
- // logerror("higher offset write\n");
+ // logerror("higher offset write\n");
}
}
diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c
index c08faa250c0..69d86898c1a 100644
--- a/src/mame/video/midzeus.c
+++ b/src/mame/video/midzeus.c
@@ -1256,7 +1256,7 @@ static void zeus_draw_quad(running_machine &machine, int long_fmt, const UINT32
}
else if (tex_type == 2)
{
- extra->get_texel = (val2 & 0x20) ? get_texel_alt_8bit : get_texel_alt_4bit;
+ extra->get_texel = (val2 & 0x20) ? get_texel_alt_8bit : get_texel_alt_4bit;
}
else
{
@@ -1462,4 +1462,4 @@ static void log_waveram(UINT32 length_and_base)
for (i = 0; i < numoctets; i++)
logerror("\t%02X: %08X %08X\n", i, ptr[i*2], ptr[i*2+1]);
-} \ No newline at end of file
+}
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index ebf3f8151a3..9729453dd3a 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -271,9 +271,9 @@ VIDEO_START( ojankohs )
ojankohs_state *state = machine.driver_data<ojankohs_state>();
state->m_tilemap = tilemap_create(machine, ojankohs_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64);
-// state->m_videoram = auto_alloc_array(machine, UINT8, 0x1000);
-// state->m_colorram = auto_alloc_array(machine, UINT8, 0x1000);
-// state->m_paletteram = auto_alloc_array(machine, UINT8, 0x800);
+// state->m_videoram = auto_alloc_array(machine, UINT8, 0x1000);
+// state->m_colorram = auto_alloc_array(machine, UINT8, 0x1000);
+// state->m_paletteram = auto_alloc_array(machine, UINT8, 0x800);
state->save_pointer(NAME(state->m_videoram), 0x1000);
state->save_pointer(NAME(state->m_colorram), 0x1000);
@@ -285,8 +285,8 @@ VIDEO_START( ojankoy )
ojankohs_state *state = machine.driver_data<ojankohs_state>();
state->m_tilemap = tilemap_create(machine, ojankoy_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64);
-// state->m_videoram = auto_alloc_array(machine, UINT8, 0x2000);
-// state->m_colorram = auto_alloc_array(machine, UINT8, 0x1000);
+// state->m_videoram = auto_alloc_array(machine, UINT8, 0x2000);
+// state->m_colorram = auto_alloc_array(machine, UINT8, 0x1000);
state->save_pointer(NAME(state->m_videoram), 0x2000);
state->save_pointer(NAME(state->m_colorram), 0x1000);
diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c
index 1ef94c43f58..5d68f3ee8f7 100644
--- a/src/mame/video/stvvdp1.c
+++ b/src/mame/video/stvvdp1.c
@@ -123,9 +123,9 @@ struct shaded_point
#define PTM_0 state->m_vdp1_regs[0x004/2]&=~0x0001
/*
- Erase/Write Data Register
- 16 bpp = data
- 8 bpp = erase/write data for even/odd X coordinates
+ Erase/Write Data Register
+ 16 bpp = data
+ 8 bpp = erase/write data for even/odd X coordinates
*/
#define STV_VDP1_EWDR ((state->m_vdp1_regs[0x006/2])&0xffff)
diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h
index 00f133566b1..6d57f21984b 100644
--- a/src/osd/windows/d3dhlsl.h
+++ b/src/osd/windows/d3dhlsl.h
@@ -57,7 +57,7 @@ struct _hlsl_options
{
bool params_dirty;
float shadow_mask_alpha;
- char shadow_mask_texture[1024];
+ char shadow_mask_texture[1024];
int shadow_mask_count_x;
int shadow_mask_count_y;
float shadow_mask_u_size;
diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index 5d3e6e5e0d3..5054538a1ce 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -141,7 +141,7 @@ enum
ID_SHOW_COMMENTS,
ID_RUN_TO_CURSOR,
ID_TOGGLE_BREAKPOINT,
-
+
ID_DEVICE_OPTIONS // keep this always at the end
};
@@ -2404,7 +2404,7 @@ static void image_update_menu(debugwin_info *info)
HMENU devicesmenu;
DeleteMenu(GetMenu(info->wnd), 2, MF_BYPOSITION);
-
+
// create the image menu
devicesmenu = CreatePopupMenu();
for (bool gotone = info->machine().devicelist().first(img); gotone; gotone = img->next(img))
@@ -2413,9 +2413,9 @@ static void image_update_menu(debugwin_info *info)
UINT flags_for_exists;
UINT flags_for_writing;
HMENU devicesubmenu = CreatePopupMenu();
-
+
UINT_PTR new_item = ID_DEVICE_OPTIONS + (cnt * DEVOPTION_MAX);
-
+
flags_for_exists = MF_ENABLED | MF_STRING;
if (!img->exists())
@@ -2428,8 +2428,8 @@ static void image_update_menu(debugwin_info *info)
AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_OPEN, TEXT("Mount..."));
/*if (img->is_creatable())
- AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_CREATE, TEXT("Create..."));
- */
+ AppendMenu(devicesubmenu, MF_STRING, new_item + DEVOPTION_CREATE, TEXT("Create..."));
+ */
AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CLOSE, TEXT("Unmount"));
if (img->device().type() == CASSETTE)
@@ -2443,11 +2443,11 @@ static void image_update_menu(debugwin_info *info)
AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CASSETTE_REWIND, TEXT("Rewind"));
AppendMenu(devicesubmenu, flags_for_exists, new_item + DEVOPTION_CASSETTE_FASTFORWARD, TEXT("Fast Forward"));
}
-
+
temp.format("%s :%s", img->device().name(), img->exists() ? img->filename() : "[empty slot]");
- AppendMenu(devicesmenu, MF_ENABLED | MF_POPUP, (UINT_PTR)devicesubmenu, tstring_from_utf8(temp.cstr()));
-
+ AppendMenu(devicesmenu, MF_ENABLED | MF_POPUP, (UINT_PTR)devicesubmenu, tstring_from_utf8(temp.cstr()));
+
cnt++;
}
AppendMenu(GetMenu(info->wnd), MF_ENABLED | MF_POPUP, (UINT_PTR)devicesmenu, TEXT("Images"));
@@ -2493,10 +2493,10 @@ void console_create_window(running_machine &machine)
// Add image menu only if image devices exist
if (info->machine().devicelist().first(img)) {
- info->update_menu = image_update_menu;
+ info->update_menu = image_update_menu;
image_update_menu(info);
}
-
+
// set the handlers
info->handle_command = disasm_handle_command;
info->handle_key = disasm_handle_key;
@@ -2887,7 +2887,7 @@ static int global_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar
return 1;
}
if (LOWORD(wparam) >= ID_DEVICE_OPTIONS) {
- UINT32 devid = (LOWORD(wparam) - ID_DEVICE_OPTIONS) / DEVOPTION_MAX;
+ UINT32 devid = (LOWORD(wparam) - ID_DEVICE_OPTIONS) / DEVOPTION_MAX;
device_image_interface *img = NULL;
UINT32 cnt = 0;
for (bool gotone = info->machine().devicelist().first(img); gotone; gotone = img->next(img))
@@ -2896,18 +2896,18 @@ static int global_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar
cnt++;
}
if (img!=NULL) {
- switch ((LOWORD(wparam) - ID_DEVICE_OPTIONS) % DEVOPTION_MAX)
+ switch ((LOWORD(wparam) - ID_DEVICE_OPTIONS) % DEVOPTION_MAX)
{
- case DEVOPTION_OPEN :
- {
+ case DEVOPTION_OPEN :
+ {
char filter[2048];
build_generic_filter(img, FALSE, filter, ARRAY_LENGTH(filter));
-
- TCHAR selectedFilename[MAX_PATH];
+
+ TCHAR selectedFilename[MAX_PATH];
selectedFilename[0] = '\0';
LPTSTR buffer;
LPTSTR t_filter = NULL;
-
+
buffer = tstring_from_utf8(filter);
// convert a pipe-char delimited string into a NUL delimited string
@@ -2919,8 +2919,8 @@ static int global_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar
t_filter[i++] = '\0';
osd_free(buffer);
-
- OPENFILENAME ofn;
+
+ OPENFILENAME ofn;
memset(&ofn,0,sizeof(ofn));
ofn.lStructSize = sizeof(ofn);
ofn.hwndOwner = NULL;
@@ -2934,40 +2934,40 @@ static int global_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar
ofn.lpstrInitialDir = NULL;
ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
- if (GetOpenFileName(&ofn)) {
+ if (GetOpenFileName(&ofn)) {
img->load(utf8_from_tstring(selectedFilename));
}
}
return 1;
-/* case DEVOPTION_CREATE:
- return 1;*/
- case DEVOPTION_CLOSE:
+/* case DEVOPTION_CREATE:
+ return 1;*/
+ case DEVOPTION_CLOSE:
img->unload();
return 1;
- default:
+ default:
if (img->device().type() == CASSETTE) {
cassette_image_device* cassette = dynamic_cast<cassette_image_device*>(&img->device());
- switch ((LOWORD(wparam) - ID_DEVICE_OPTIONS) % DEVOPTION_MAX)
+ switch ((LOWORD(wparam) - ID_DEVICE_OPTIONS) % DEVOPTION_MAX)
{
- case DEVOPTION_CASSETTE_STOPPAUSE:
+ case DEVOPTION_CASSETTE_STOPPAUSE:
cassette->change_state(CASSETTE_STOPPED, CASSETTE_MASK_UISTATE);
return 1;
- case DEVOPTION_CASSETTE_PLAY:
+ case DEVOPTION_CASSETTE_PLAY:
cassette->change_state(CASSETTE_PLAY, CASSETTE_MASK_UISTATE);
return 1;
- case DEVOPTION_CASSETTE_RECORD:
+ case DEVOPTION_CASSETTE_RECORD:
cassette->change_state(CASSETTE_RECORD, CASSETTE_MASK_UISTATE);
return 1;
- case DEVOPTION_CASSETTE_REWIND:
+ case DEVOPTION_CASSETTE_REWIND:
cassette->seek(-60.0, SEEK_CUR);
return 1;
- case DEVOPTION_CASSETTE_FASTFORWARD:
+ case DEVOPTION_CASSETTE_FASTFORWARD:
cassette->seek(+60.0, SEEK_CUR);
- return 1;
+ return 1;
}
- }
- }
+ }
+ }
}
}
return 0;
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 3790295b403..b03bc27752e 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -329,14 +329,14 @@ const options_entry windows_options::s_option_entries[] =
// post-processing options
{ NULL, NULL, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" },
{ WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enable HLSL post-processing (PS3.0 required)" },
- { WINOPTION_HLSL_INI_NAME, "%g", OPTION_STRING, "HLSL INI file path" },
+ { WINOPTION_HLSL_INI_NAME, "%g", OPTION_STRING, "HLSL INI file path" },
{ WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" },
- { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" },
- { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" },
+ { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" },
+ { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" },
{ WINOPTION_HLSL_PRESET";(-1-3)", "-1", OPTION_INTEGER, "HLSL preset to use (0-3)" },
{ WINOPTION_HLSL_WRITE, NULL, OPTION_STRING, "enable HLSL AVI writing (huge disk bandwidth suggested)" },
- { WINOPTION_HLSL_SNAP_WIDTH, "2048", OPTION_STRING, "HLSL upscaled-snapshot width" },
- { WINOPTION_HLSL_SNAP_HEIGHT, "1536", OPTION_STRING, "HLSL upscaled-snapshot height" },
+ { WINOPTION_HLSL_SNAP_WIDTH, "2048", OPTION_STRING, "HLSL upscaled-snapshot width" },
+ { WINOPTION_HLSL_SNAP_HEIGHT, "1536", OPTION_STRING, "HLSL upscaled-snapshot height" },
{ WINOPTION_SHADOW_MASK_ALPHA";fs_shadwa(0.0-1.0)", "0.0", OPTION_FLOAT, "shadow mask alpha-blend value (1.0 is fully blended, 0.0 is no mask)" },
{ WINOPTION_SHADOW_MASK_TEXTURE";fs_shadwt(0.0-1.0)", "aperture.png", OPTION_STRING, "shadow mask texture name" },
{ WINOPTION_SHADOW_MASK_COUNT_X";fs_shadww", "320", OPTION_INTEGER, "shadow mask width, in phosphor dots" },
@@ -353,20 +353,20 @@ const options_entry windows_options::s_option_entries[] =
{ WINOPTION_SCANLINE_BRIGHT_OFFSET";fs_scanbo(0.0-1.0)", "0.0", OPTION_FLOAT, "overall brightness offset value for scanlines (additive)" },
{ WINOPTION_SCANLINE_OFFSET";fs_scanjt(0.0-4.0)", "0.0", OPTION_FLOAT, "overall interlace jitter scaling value for scanlines" },
{ WINOPTION_DEFOCUS";fs_focus", "0.0,0.0", OPTION_STRING, "overall defocus value in screen-relative coords" },
- { WINOPTION_CONVERGE_X";fs_convx", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative X direction" },
- { WINOPTION_CONVERGE_Y";fs_convy", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative Y direction" },
- { WINOPTION_RADIAL_CONVERGE_X";fs_rconvx", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative X direction" },
- { WINOPTION_RADIAL_CONVERGE_Y";fs_rconvy", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative Y direction" },
+ { WINOPTION_CONVERGE_X";fs_convx", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative X direction" },
+ { WINOPTION_CONVERGE_Y";fs_convy", "0.0,0.0,0.0",OPTION_STRING, "convergence in screen-relative Y direction" },
+ { WINOPTION_RADIAL_CONVERGE_X";fs_rconvx", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative X direction" },
+ { WINOPTION_RADIAL_CONVERGE_Y";fs_rconvy", "0.0,0.0,0.0",OPTION_STRING, "radial convergence in screen-relative Y direction" },
/* RGB colorspace convolution below this line */
- { WINOPTION_RED_RATIO";fs_redratio", "1.0,0.0,0.0",OPTION_STRING, "red output signal generated by input signal" },
- { WINOPTION_GRN_RATIO";fs_grnratio", "0.0,1.0,0.0",OPTION_STRING, "green output signal generated by input signal" },
- { WINOPTION_BLU_RATIO";fs_bluratio", "0.0,0.0,1.0",OPTION_STRING, "blue output signal generated by input signal" },
+ { WINOPTION_RED_RATIO";fs_redratio", "1.0,0.0,0.0",OPTION_STRING, "red output signal generated by input signal" },
+ { WINOPTION_GRN_RATIO";fs_grnratio", "0.0,1.0,0.0",OPTION_STRING, "green output signal generated by input signal" },
+ { WINOPTION_BLU_RATIO";fs_bluratio", "0.0,0.0,1.0",OPTION_STRING, "blue output signal generated by input signal" },
{ WINOPTION_SATURATION";fs_sat(0.0-4.0)", "1.0", OPTION_FLOAT, "saturation scaling value" },
- { WINOPTION_OFFSET";fs_offset", "0.0,0.0,0.0",OPTION_STRING, "signal offset value (additive)" },
- { WINOPTION_SCALE";fs_scale", "1.0,1.0,1.0",OPTION_STRING, "signal scaling value (multiplicative)" },
+ { WINOPTION_OFFSET";fs_offset", "0.0,0.0,0.0",OPTION_STRING, "signal offset value (additive)" },
+ { WINOPTION_SCALE";fs_scale", "1.0,1.0,1.0",OPTION_STRING, "signal scaling value (multiplicative)" },
{ WINOPTION_POWER";fs_power", "1.0,1.0,1.0",OPTION_STRING, "signal power value (exponential)" },
- { WINOPTION_FLOOR";fs_floor", "0.0,0.0,0.0",OPTION_STRING, "signal floor level" },
- { WINOPTION_PHOSPHOR";fs_phosphor", "0.0,0.0,0.0",OPTION_STRING, "phosphorescence decay rate (0.0 is instant, 1.0 is forever)" },
+ { WINOPTION_FLOOR";fs_floor", "0.0,0.0,0.0",OPTION_STRING, "signal floor level" },
+ { WINOPTION_PHOSPHOR";fs_phosphor", "0.0,0.0,0.0",OPTION_STRING, "phosphorescence decay rate (0.0 is instant, 1.0 is forever)" },
/* NTSC simulation below this line */
{ WINOPTION_YIQ_ENABLE";yiq", "0", OPTION_BOOLEAN, "enable YIQ-space HLSL post-processing" },
{ WINOPTION_YIQ_CCVALUE";yiqcc", "3.59754545",OPTION_FLOAT, "Color Carrier frequency for NTSC signal processing" },
diff --git a/src/version.c b/src/version.c
index 5b2bfbe2d93..7529d6902c4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.142u5 ("__DATE__")";
+const char build_version[] = "0.142u6 ("__DATE__")";