[Vice-emu-commit] SF.net SVN: vice-emu: [18767] branches/fabrizio/v1.22.13-newjoydesign/vice/ src/j

Revision: 18767
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18767&view=rev
Author:   fabbo
Date:     2008-05-05 13:00:11 -0700 (Mon, 05 May 2008)

Log Message:
-----------
Fix a merge error

Modified Paths:
--------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c	2008-05-05 19:50:53 UTC (rev 18766)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c	2008-05-05 20:00:11 UTC (rev 18767)
@@ -83,7 +83,6 @@
         else
             memcpy(joystick_value, network_joystick_value, sizeof(joystick_value));
     } else {
-        idx = latch_joystick_value[0];
         memcpy(joystick_value, latch_joystick_value, sizeof(joystick_value));
     }
     ui_display_joyport(joystick_value);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.