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

src/mess/image.c
r2225r2226
1515#include "mame.h"
1616#include "image.h"
1717#include "mess.h"
18#include "deprecat.h"
1918#include "unzip.h"
2019#include "devices/flopdrv.h"
2120#include "utils.h"
r2225r2226
16371636
16381637
16391638
1640const device_config *image_from_absolute_index(int absolute_index)
1639const device_config *image_from_absolute_index(running_machine *machine, int absolute_index)
16411640{
1642   return Machine->images_data->slots[absolute_index].dev;
1641   return machine->images_data->slots[absolute_index].dev;
16431642}
src/mess/image.h
r2225r2226
183183****************************************************************************/
184184
185185int image_absolute_index(const device_config *image);
186const device_config *image_from_absolute_index(int absolute_index);
186const device_config *image_from_absolute_index(running_machine *machine, int absolute_index);
187187
188188
189189
src/mess/osd/windows/menu.c
r2225r2226
15961596//   decode_deviceoption
15971597//============================================================
15981598
1599static const device_config *decode_deviceoption(int command, int *devoption)
1599static const device_config *decode_deviceoption(running_machine *machine, int command, int *devoption)
16001600{
16011601   int absolute_index;
16021602
r2225r2226
16061606   if (devoption)
16071607      *devoption = command % DEVOPTION_MAX;
16081608
1609   return image_from_absolute_index(absolute_index);
1609   return image_from_absolute_index(machine, absolute_index);
16101610}
16111611
16121612
r2225r2226
18271827         else if ((command >= ID_DEVICE_0) && (command < ID_DEVICE_0 + (MAX_DEV_INSTANCES*IO_COUNT*DEVOPTION_MAX)))
18281828         {
18291829            // change device
1830            img = decode_deviceoption(command, &dev_command);
1830            img = decode_deviceoption(machine, command, &dev_command);
18311831            device_command(wnd, img, dev_command);
18321832         }
18331833         else if ((command >= ID_JOYSTICK_0) && (command < ID_JOYSTICK_0 + MAX_JOYSTICKS))

Previous 15994 Revisions Next


© 1998-2018 The MESS Team