Changed default Joysticks

This commit is contained in:
fabio.olimpieri 2012-04-21 10:50:52 +00:00
parent d9d9f5392b
commit 31aa295ee2
4 changed files with 16 additions and 7 deletions

View File

@ -128,6 +128,14 @@ dist: $(BUILD)
touch $@/fbzx-wii/microdrives/dummy touch $@/fbzx-wii/microdrives/dummy
cd $@ && tar -czf ../fbzx-wii-bin.tar.gz * cd $@ && tar -czf ../fbzx-wii-bin.tar.gz *
distsource:
cd .. && cp -r fbzx-wii fbzx-wii-v
cd ../fbzx-wii-v && find . -name ".svn" | xargs rm -rf
cd .. && tar -czf fbzx-wii-v.tar.gz fbzx-wii-v
cd .. && rm -fr fbzx-wii-v
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
run: run:
wiiload $(TARGET).dol wiiload $(TARGET).dol

View File

@ -434,7 +434,7 @@ int load_sna(char *filename) {
snap.ay_regs[loop]=0; snap.ay_regs[loop]=0;
snap.ay_latch=0; snap.ay_latch=0;
snap.issue=3; snap.issue=3;
snap.joystick=0; snap.joystick=1; //kempston
printf("Loading SNA file\n"); printf("Loading SNA file\n");

View File

@ -80,8 +80,8 @@ void computer_init () {
ordenador.port254 = 0; ordenador.port254 = 0;
ordenador.issue = 3; ordenador.issue = 3;
ordenador.mode128k = 0; ordenador.mode128k = 0;
ordenador.joystick[0] = 2; //Sinclair 1 ordenador.joystick[0] = 1; //Kemposton
ordenador.joystick[1] = 3; //Sinclair 2 ordenador.joystick[1] = 0; // Cursor
ordenador.tape_readed = 0; ordenador.tape_readed = 0;
ordenador.pause = 1; // tape stop ordenador.pause = 1; // tape stop
@ -943,6 +943,7 @@ inline void read_keyboard () {
if (ordenador.joy_fire[loop]) ordenador.k12|= 1; if (ordenador.joy_fire[loop]) ordenador.k12|= 1;
break; break;
} }
}
if (ordenador.key[SDLK_SPACE]) ordenador.k15|=1; if (ordenador.key[SDLK_SPACE]) ordenador.k15|=1;
if (ordenador.key[SDLK_RCTRL]) ordenador.k15|=2; if (ordenador.key[SDLK_RCTRL]) ordenador.k15|=2;

View File

@ -68,7 +68,6 @@ char *filenames[5];
int load_zxspectrum_picture() int load_zxspectrum_picture()
{ {
SDL_Surface *image; SDL_Surface *image;
SDL_Rect dest;
image=IMG_Load("/fbzx-wii/fbzx/ZXSpectrum48k.png"); image=IMG_Load("/fbzx-wii/fbzx/ZXSpectrum48k.png");
@ -708,6 +707,9 @@ int main(int argc,char *argv[]) {
ordenador.screenbuffer=ordenador.screen->pixels; ordenador.screenbuffer=ordenador.screen->pixels;
ordenador.screen_width=ordenador.screen->w; ordenador.screen_width=ordenador.screen->w;
//Load the splash screen
if (load_zxspectrum_picture()) sleep(3);
// assign initial values for PATH variables // assign initial values for PATH variables
strcpy(path_snaps,getenv("HOME")); strcpy(path_snaps,getenv("HOME"));
@ -722,8 +724,6 @@ int main(int argc,char *argv[]) {
ordenador.current_tap[0]=0; ordenador.current_tap[0]=0;
if (load_zxspectrum_picture()) sleep(5);
// assign random values to the memory before start execution // assign random values to the memory before start execution
printf("Reset memory\n"); printf("Reset memory\n");