trunk/src/devices/imagedev/snapquik.cpp
| r250196 | r250197 | |
| 20 | 20 | |
| 21 | 21 | snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) |
| 22 | 22 | : device_t(mconfig, SNAPSHOT, "Snapshot", tag, owner, clock, "snapshot_image", __FILE__), |
| 23 | | device_image_interface(mconfig, *this), |
| 24 | | m_interface(NULL), |
| 25 | | m_delay_attoseconds(0) |
| 23 | device_image_interface(mconfig, *this), |
| 24 | m_file_extensions(NULL), |
| 25 | m_interface(NULL), |
| 26 | m_delay_seconds(0), |
| 27 | m_delay_attoseconds(0), |
| 28 | m_timer(NULL) |
| 26 | 29 | { |
| 27 | 30 | } |
| 28 | 31 | |
| 29 | 32 | snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : |
| 30 | | device_t(mconfig, type, name, tag, owner, clock, shortname, source), |
| 31 | | device_image_interface(mconfig, *this), |
| 32 | | m_interface(NULL), |
| 33 | | m_delay_attoseconds(0) |
| 33 | device_t(mconfig, type, name, tag, owner, clock, shortname, source), |
| 34 | device_image_interface(mconfig, *this), |
| 35 | m_file_extensions(NULL), |
| 36 | m_interface(NULL), |
| 37 | m_delay_seconds(0), |
| 38 | m_delay_attoseconds(0), |
| 39 | m_timer(NULL) |
| 34 | 40 | { |
| 35 | 41 | } |
| 36 | 42 | //------------------------------------------------- |
trunk/src/emu/emuopts.cpp
| r250196 | r250197 | |
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | | while (add_slot_options(false)); |
| 293 | while (add_slot_options(false)) { } |
| 294 | 294 | add_device_options(false); |
| 295 | 295 | } |
| 296 | 296 | |
| r250196 | r250197 | |
| 359 | 359 | bool emu_options::parse_slot_devices(int argc, char *argv[], std::string &error_string, const char *name, const char *value) |
| 360 | 360 | { |
| 361 | 361 | // an initial parse to capture the initial set of values |
| 362 | | bool result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); |
| 362 | bool result; |
| 363 | |
| 364 | core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); |
| 363 | 365 | |
| 364 | 366 | // keep adding slot options until we stop seeing new stuff |
| 365 | 367 | bool isfirstpass = true; |
| 366 | 368 | while (add_slot_options(isfirstpass)) |
| 367 | 369 | { |
| 368 | | result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); |
| 370 | core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); |
| 369 | 371 | isfirstpass = false; |
| 370 | 372 | } |
| 371 | 373 | |
| r250196 | r250197 | |
| 373 | 375 | add_device_options(true); |
| 374 | 376 | if (name != NULL && exists(name)) |
| 375 | 377 | set_value(name, value, OPTION_PRIORITY_CMDLINE, error_string); |
| 376 | | result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); |
| 378 | core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); |
| 377 | 379 | |
| 378 | | int num = 0; |
| 380 | int num; |
| 379 | 381 | do { |
| 380 | 382 | num = options_count(); |
| 381 | 383 | update_slot_options(); |
| r250196 | r250197 | |
| 528 | 530 | |
| 529 | 531 | // then add the options |
| 530 | 532 | add_device_options(true); |
| 531 | | int num = 0; |
| 533 | int num; |
| 532 | 534 | do { |
| 533 | 535 | num = options_count(); |
| 534 | 536 | update_slot_options(); |
trunk/src/emu/ui/filesel.cpp
| r250196 | r250197 | |
| 271 | 271 | item_append("New Image Name:", new_image_name, 0, ITEMREF_NEW_IMAGE_NAME); |
| 272 | 272 | |
| 273 | 273 | // do we support multiple formats? |
| 274 | | format = m_image->formatlist(); |
| 274 | if (ENABLE_FORMATS) format = m_image->formatlist(); |
| 275 | 275 | if (ENABLE_FORMATS && (format != NULL)) |
| 276 | 276 | { |
| 277 | 277 | item_append("Image Format:", m_current_format->description(), 0, ITEMREF_FORMAT); |
trunk/src/emu/ui/viewgfx.cpp
| r250196 | r250197 | |
| 192 | 192 | i < tempcount && state.gfxset.devcount < MAX_GFX_DECODERS; |
| 193 | 193 | i++, interface = gfx_iter.next()) |
| 194 | 194 | { |
| 195 | | for (count = 0; count < MAX_GFX_ELEMENTS && interface->gfx(count) != NULL; count++); |
| 195 | for (count = 0; count < MAX_GFX_ELEMENTS && interface->gfx(count) != NULL; count++) { } |
| 196 | 196 | |
| 197 | 197 | // count = index of first NULL |
| 198 | 198 | if (count > 0) |
| r250196 | r250197 | |
| 1006 | 1006 | pixelscale = state.tilemap.zoom; |
| 1007 | 1007 | if (pixelscale == 0) |
| 1008 | 1008 | { |
| 1009 | | for (maxxscale = 1; mapwidth * (maxxscale + 1) < mapboxwidth; maxxscale++) ; |
| 1010 | | for (maxyscale = 1; mapheight * (maxyscale + 1) < mapboxheight; maxyscale++) ; |
| 1009 | for (maxxscale = 1; mapwidth * (maxxscale + 1) < mapboxwidth; maxxscale++) { } |
| 1010 | for (maxyscale = 1; mapheight * (maxyscale + 1) < mapboxheight; maxyscale++) { } |
| 1011 | 1011 | pixelscale = MIN(maxxscale, maxyscale); |
| 1012 | 1012 | } |
| 1013 | 1013 | |
trunk/src/emu/validity.cpp
| r250196 | r250197 | |
| 719 | 719 | if (field.type() == IPT_POSITIONAL || field.type() == IPT_POSITIONAL_V) |
| 720 | 720 | { |
| 721 | 721 | int shift; |
| 722 | | for (shift = 0; shift <= 31 && (~field.mask() & (1 << shift)) != 0; shift++) ; |
| 722 | for (shift = 0; shift <= 31 && (~field.mask() & (1 << shift)) != 0; shift++) { } |
| 723 | 723 | |
| 724 | 724 | // convert the positional max value to be in the bitmask for testing |
| 725 | | INT32 analog_max = field.maxval(); |
| 726 | | analog_max = (analog_max - 1) << shift; |
| 725 | //INT32 analog_max = field.maxval(); |
| 726 | //analog_max = (analog_max - 1) << shift; |
| 727 | 727 | |
| 728 | 728 | // positional port size must fit in bits used |
| 729 | 729 | if ((field.mask() >> shift) + 1 < field.maxval()) |