← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/emu/crsshair.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/emu/crsshair.c
221
221
        global.auto_time = CROSSHAIR_VISIBILITY_AUTOTIME_DEFAULT;
222
222
 
223
223
        /* determine who needs crosshairs */
224
 
        for (input_port_config *port = machine.m_portlist.first(); port != NULL; port = port->next())
225
 
                for (input_field_config *field = port->fieldlist().first(); field != NULL; field = field->next())
226
 
                        if (field->crossaxis != CROSSHAIR_AXIS_NONE)
 
224
        for (ioport_port *port = machine.ioport().first_port(); port != NULL; port = port->next())
 
225
                for (ioport_field *field = port->first_field(); field != NULL; field = field->next())
 
226
                        if (field->crosshair_axis() != CROSSHAIR_AXIS_NONE)
227
227
                        {
228
 
                                int player = field->player;
 
228
                                int player = field->player();
229
229
 
230
230
                                assert(player < MAX_PLAYERS);
231
231
 
347
347
        {
348
348
                /* read all the lightgun values */
349
349
                if (global.used[player])
350
 
                        input_port_get_crosshair_position(device.machine(), player, &global.x[player], &global.y[player]);
 
350
                        device.machine().ioport().crosshair_position(player, global.x[player], global.y[player]);
351
351
 
352
352
                /* auto visibility */
353
353
                if (global.mode[player] == CROSSHAIR_VISIBILITY_AUTO)