| Previous | 15994 Revisions | Next |
| r2226 Thursday 3rd April, 2008 at 00:27:07 UTC by Nathan Woods |
|---|
| Removed use of deprecat.h from image.c |
| [src/mess] | image.c image.h |
| [src/mess/osd/windows] | menu.c |
| r2225 | r2226 | |
|---|---|---|
| 15 | 15 | #include "mame.h" |
| 16 | 16 | #include "image.h" |
| 17 | 17 | #include "mess.h" |
| 18 | #include "deprecat.h" | |
| 19 | 18 | #include "unzip.h" |
| 20 | 19 | #include "devices/flopdrv.h" |
| 21 | 20 | #include "utils.h" |
| r2225 | r2226 | |
| 1637 | 1636 | |
| 1638 | 1637 | |
| 1639 | 1638 | |
| 1640 | const device_config *image_from_absolute_index(int absolute_index) | |
| 1639 | const device_config *image_from_absolute_index(running_machine *machine, int absolute_index) | |
| 1641 | 1640 | { |
| 1642 | return | |
| 1641 | return machine->images_data->slots[absolute_index].dev; | |
| 1643 | 1642 | } |
| r2225 | r2226 | |
|---|---|---|
| 183 | 183 | ****************************************************************************/ |
| 184 | 184 | |
| 185 | 185 | int image_absolute_index(const device_config *image); |
| 186 | const device_config *image_from_absolute_index(int absolute_index); | |
| 186 | const device_config *image_from_absolute_index(running_machine *machine, int absolute_index); | |
| 187 | 187 | |
| 188 | 188 | |
| 189 | 189 |
| r2225 | r2226 | |
|---|---|---|
| 1596 | 1596 | // decode_deviceoption |
| 1597 | 1597 | //============================================================ |
| 1598 | 1598 | |
| 1599 | static const device_config *decode_deviceoption(int command, int *devoption) | |
| 1599 | static const device_config *decode_deviceoption(running_machine *machine, int command, int *devoption) | |
| 1600 | 1600 | { |
| 1601 | 1601 | int absolute_index; |
| 1602 | 1602 | |
| r2225 | r2226 | |
| 1606 | 1606 | if (devoption) |
| 1607 | 1607 | *devoption = command % DEVOPTION_MAX; |
| 1608 | 1608 | |
| 1609 | return image_from_absolute_index(absolute_index); | |
| 1609 | return image_from_absolute_index(machine, absolute_index); | |
| 1610 | 1610 | } |
| 1611 | 1611 | |
| 1612 | 1612 | |
| r2225 | r2226 | |
| 1827 | 1827 | else if ((command >= ID_DEVICE_0) && (command < ID_DEVICE_0 + (MAX_DEV_INSTANCES*IO_COUNT*DEVOPTION_MAX))) |
| 1828 | 1828 | { |
| 1829 | 1829 | // change device |
| 1830 | img = decode_deviceoption(command, &dev_command); | |
| 1830 | img = decode_deviceoption(machine, command, &dev_command); | |
| 1831 | 1831 | device_command(wnd, img, dev_command); |
| 1832 | 1832 | } |
| 1833 | 1833 | else if ((command >= ID_JOYSTICK_0) && (command < ID_JOYSTICK_0 + MAX_JOYSTICKS)) |
| Previous | 15994 Revisions | Next |