diff options
author | Vas Crabb <vas@vastheman.com> | 2016-08-01 18:46:56 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2016-08-01 18:47:22 +1000 |
commit | 15e7be7ac8e4127e9fc0f9b5c248f4a73ba85703 (patch) | |
tree | 71346f2c2d1ac08e0e9c9f4dea8f2537af380143 /src/mame/drivers/studio2.cpp | |
parent | c4c05c9735a5b956de128d6017027658b6c61a8e (diff) |
Turn image init/validate into scoped enums to avoid accidental casts to/from integer and boolean types
The image error should also be turned into a scoped enum - the menus were assuming it was the same thing as an init result
Diffstat (limited to 'src/mame/drivers/studio2.cpp')
-rw-r--r-- | src/mame/drivers/studio2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index b1b27d475bc..fac2de99592 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -544,7 +544,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) if (image.length() <= 0x100) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid ROM file"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread(&header, 0x100); @@ -553,7 +553,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) if (strncmp((const char *)header, "RCA2", 4)) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Not an .ST2 file"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } blocks = header[4]; @@ -583,7 +583,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) if (size > 0x400) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } else image.fread(m_cart->get_rom_base(), size); @@ -603,7 +603,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) memcpy(m_cart->get_rom_base() + 0xa00, image.get_software_region("rom_e00"), image.get_software_region_length("rom_e00")); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } |