mirror of
https://git.freebsd.org/ports.git
synced 2025-07-02 10:00:37 -04:00
55 lines
2.1 KiB
C
55 lines
2.1 KiB
C
--- src/memory.c.orig 2006-04-28 17:13:47 UTC
|
|
+++ src/memory.c
|
|
@@ -33,6 +33,10 @@
|
|
#include "message.h"
|
|
#include "sgb.h"
|
|
|
|
+Uint16 key[SDLK_LAST];
|
|
+
|
|
+Uint8 vram_pal_line_temp[160][4];
|
|
+
|
|
static Uint8 gb_pad;
|
|
|
|
Uint8 rom_mask;
|
|
@@ -67,7 +71,7 @@ Uint8 ram_mask;
|
|
MEM_READ_ENTRY mem_read_tab[0x10];
|
|
MEM_WRITE_ENTRY mem_write_tab[0x10];
|
|
|
|
-Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0;
|
|
+Sint16 joy_x_min=0,joy_x_max=0,joy_y_min=0,joy_y_max=0;
|
|
|
|
void (*select_rom_page)(Uint16 adr,Uint8 v);
|
|
void (*select_ram_page)(Uint16 adr,Uint8 v);
|
|
@@ -742,6 +746,13 @@ __inline__ void update_gb_pad(void) {
|
|
if (!conf.play_movie) {
|
|
|
|
if (conf.use_joy) {
|
|
+ Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]];
|
|
+ Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]];
|
|
+ Sint16 joy_x_mid=(joy_x_max-joy_x_min) / 2;
|
|
+ Sint16 joy_y_mid=(joy_y_max-joy_y_min) / 2;
|
|
+ Sint16 joy_x_qua=joy_x_mid / 2;
|
|
+ Sint16 joy_y_qua=joy_y_mid / 2;
|
|
+
|
|
if ((joy_but[jmap[PAD_START]]) || (key[kmap[PAD_START]])) gb_pad|=0x08; /* Start */
|
|
if ((joy_but[jmap[PAD_SELECT]]) || (key[kmap[PAD_SELECT]])) gb_pad|=0x04; /* Select */
|
|
if ((joy_but[jmap[PAD_A]]) || (key[kmap[PAD_A]])) gb_pad|=0x01; /* A */
|
|
@@ -752,18 +763,10 @@ __inline__ void update_gb_pad(void) {
|
|
if ((joy_axis[jmap[PAD_UP]]<-10000) || (key[kmap[PAD_UP]])) gb_pad|=0x40;
|
|
if ((joy_axis[jmap[PAD_DOWN]]>10000) || (key[kmap[PAD_DOWN]])) gb_pad|=0x80;*/
|
|
|
|
- Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]];
|
|
- Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]];
|
|
-
|
|
if (joy_x_pos>joy_x_max) joy_x_max=joy_x_pos;
|
|
if (joy_x_pos<joy_x_min) joy_x_min=joy_x_pos;
|
|
if (joy_y_pos>joy_y_max) joy_y_max=joy_y_pos;
|
|
if (joy_y_pos<joy_y_min) joy_y_min=joy_y_pos;
|
|
-
|
|
- Sint16 joy_x_mid=(joy_x_max-joy_x_min) / 2;
|
|
- Sint16 joy_y_mid=(joy_y_max-joy_y_min) / 2;
|
|
- Sint16 joy_x_qua=joy_x_mid / 2;
|
|
- Sint16 joy_y_qua=joy_y_mid / 2;
|
|
|
|
if ((joy_x_pos<(joy_x_mid-joy_x_qua)) || (key[kmap[PAD_LEFT]])) gb_pad|=0x20;
|
|
if ((joy_x_pos>(joy_x_mid+joy_x_qua)) || (key[kmap[PAD_RIGHT]])) gb_pad|=0x10;
|