|
Line 0
Link Here
|
|
|
1 |
--- src/memory.c.orig Sat Apr 29 02:13:47 2006 |
| 2 |
+++ src/memory.c Sat Sep 9 18:12:36 2006 |
| 3 |
@@ -67,7 +67,7 @@ |
| 4 |
MEM_READ_ENTRY mem_read_tab[0x10]; |
| 5 |
MEM_WRITE_ENTRY mem_write_tab[0x10]; |
| 6 |
|
| 7 |
-Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0; |
| 8 |
+Sint16 joy_x_min=0,joy_x_max=0,joy_y_min=0,joy_y_max=0; |
| 9 |
|
| 10 |
void (*select_rom_page)(Uint16 adr,Uint8 v); |
| 11 |
void (*select_ram_page)(Uint16 adr,Uint8 v); |
| 12 |
@@ -742,6 +742,13 @@ |
| 13 |
if (!conf.play_movie) { |
| 14 |
|
| 15 |
if (conf.use_joy) { |
| 16 |
+ Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]]; |
| 17 |
+ Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]]; |
| 18 |
+ Sint16 joy_x_mid=(joy_x_max-joy_x_min) / 2; |
| 19 |
+ Sint16 joy_y_mid=(joy_y_max-joy_y_min) / 2; |
| 20 |
+ Sint16 joy_x_qua=joy_x_mid / 2; |
| 21 |
+ Sint16 joy_y_qua=joy_y_mid / 2; |
| 22 |
+ |
| 23 |
if ((joy_but[jmap[PAD_START]]) || (key[kmap[PAD_START]])) gb_pad|=0x08; /* Start */ |
| 24 |
if ((joy_but[jmap[PAD_SELECT]]) || (key[kmap[PAD_SELECT]])) gb_pad|=0x04; /* Select */ |
| 25 |
if ((joy_but[jmap[PAD_A]]) || (key[kmap[PAD_A]])) gb_pad|=0x01; /* A */ |
| 26 |
@@ -752,18 +759,10 @@ |
| 27 |
if ((joy_axis[jmap[PAD_UP]]<-10000) || (key[kmap[PAD_UP]])) gb_pad|=0x40; |
| 28 |
if ((joy_axis[jmap[PAD_DOWN]]>10000) || (key[kmap[PAD_DOWN]])) gb_pad|=0x80;*/ |
| 29 |
|
| 30 |
- Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]]; |
| 31 |
- Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]]; |
| 32 |
- |
| 33 |
if (joy_x_pos>joy_x_max) joy_x_max=joy_x_pos; |
| 34 |
if (joy_x_pos<joy_x_min) joy_x_min=joy_x_pos; |
| 35 |
if (joy_y_pos>joy_y_max) joy_y_max=joy_y_pos; |
| 36 |
if (joy_y_pos<joy_y_min) joy_y_min=joy_y_pos; |
| 37 |
- |
| 38 |
- Sint16 joy_x_mid=(joy_x_max-joy_x_min) / 2; |
| 39 |
- Sint16 joy_y_mid=(joy_y_max-joy_y_min) / 2; |
| 40 |
- Sint16 joy_x_qua=joy_x_mid / 2; |
| 41 |
- Sint16 joy_y_qua=joy_y_mid / 2; |
| 42 |
|
| 43 |
if ((joy_x_pos<(joy_x_mid-joy_x_qua)) || (key[kmap[PAD_LEFT]])) gb_pad|=0x20; |
| 44 |
if ((joy_x_pos>(joy_x_mid+joy_x_qua)) || (key[kmap[PAD_RIGHT]])) gb_pad|=0x10; |