X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=a0a06dbcebc02697d1721b1bc31b33fa44e6187e;hb=21c25c56356db2138816a0716d73934ac3893e89;hp=acc371dcfa8945ba3b994250f478bb0b0b5c5ae9;hpb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index acc371dc..a0a06dbc 100644 --- a/src/screens.c +++ b/src/screens.c @@ -24,6 +24,7 @@ #include "joystick.h" #include "cartoons.h" #include "network.h" +#include "init.h" #ifdef MSDOS extern unsigned char get_ascii(KeySym); @@ -43,6 +44,7 @@ void DrawHeadline() void DrawMainMenu() { int i; + char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:"); FadeSounds(); GetPlayerConfig(); @@ -50,8 +52,8 @@ void DrawMainMenu() ClearWindow(); DrawHeadline(); - DrawText(SX + 32, SY + 2*32, "Name:", FS_BIG, FC_GREEN); - DrawText(SX + 6*32, SY + 2*32, local_player->alias_name, FS_BIG, FC_RED); + DrawText(SX + 32, SY + 2*32, name_text, FS_BIG, FC_GREEN); + DrawText(SX + 6*32, SY + 2*32, setup.alias_name, FS_BIG, FC_RED); DrawText(SX + 32, SY + 3*32, "Level:", FS_BIG, FC_GREEN); DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG, (level_nr local_player->handicap) - level_nr = local_player->handicap; - */ - - DrawTextExt(drawto,gc,SX+11*32,SY+3*32, int2str(level_nr,3), FS_BIG,FC_RED); DrawTextExt(window,gc,SX+11*32,SY+3*32, @@ -191,22 +192,14 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (y==3) { game_status = TYPENAME; - HandleTypeName(strlen(local_player->alias_name),0); + HandleTypeName(strlen(setup.alias_name),0); } else if (y==4) { if (num_leveldirs) { game_status = CHOOSELEVEL; - - SaveLevelSetup(); - -#if 0 - SavePlayerInfo(PLAYER_LEVEL); -#endif - - DrawChooseLevel(); } } @@ -229,7 +222,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y==8) { - if (setup.autorecord_on) + if (setup.autorecord) TapeStartRecording(); if (options.network) @@ -247,19 +240,12 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y==10) { - SaveLevelSetup(); - -#if 0 - SavePlayerInfo(PLAYER_LEVEL); -#endif - if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } - if (!button) - redraw = TRUE; + redraw = TRUE; } } BackToFront(); @@ -701,24 +687,6 @@ void HandleHelpScreen(int button) BackToFront(); } - -#if 0 -void CheckCheat() -{ - int old_handicap = local_player->handicap; - - if (!strcmp(local_player->alias_name,"Artsoft")) - local_player->handicap = leveldir[leveldir_nr].levels-1; - - if (local_player->handicap != old_handicap) - { - SavePlayerInfo(PLAYER_LEVEL); - level_nr = local_player->handicap; - } -} -#endif - - void HandleTypeName(int newxpos, KeySym key) { static int xpos = 0, ypos = 2; @@ -727,7 +695,7 @@ void HandleTypeName(int newxpos, KeySym key) if (newxpos) { xpos = newxpos; - DrawText(SX+6*32, SY+ypos*32, local_player->alias_name, FS_BIG, FC_YELLOW); + DrawText(SX+6*32, SY+ypos*32, setup.alias_name, FS_BIG, FC_YELLOW); DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); return; } @@ -744,48 +712,31 @@ void HandleTypeName(int newxpos, KeySym key) if((ascii = get_ascii(key)) && xposalias_name[xpos] = ascii; - local_player->alias_name[xpos+1] = 0; + setup.alias_name[xpos] = ascii; + setup.alias_name[xpos+1] = 0; xpos++; DrawTextExt(drawto,gc,SX+6*32,SY+ypos*32, - local_player->alias_name,FS_BIG,FC_YELLOW); + setup.alias_name,FS_BIG,FC_YELLOW); DrawTextExt(window,gc,SX+6*32,SY+ypos*32, - local_player->alias_name,FS_BIG,FC_YELLOW); + setup.alias_name,FS_BIG,FC_YELLOW); DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); } else if ((key==XK_Delete || key==XK_BackSpace) && xpos>0) { xpos--; - local_player->alias_name[xpos] = 0; + setup.alias_name[xpos] = 0; DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); DrawGraphic(xpos+7,ypos,GFX_LEERRAUM); } else if (key==XK_Return && xpos>0) { - DrawText(SX+6*32,SY+ypos*32,local_player->alias_name,FS_BIG,FC_RED); + DrawText(SX+6*32,SY+ypos*32,setup.alias_name,FS_BIG,FC_RED); DrawGraphic(xpos+6,ypos,GFX_LEERRAUM); - SaveSetup(); - - -#if 0 - SavePlayerInfo(PLAYER_SETUP); -#endif - - - -#if 0 - CheckCheat(); -#endif - - game_status = MAINMENU; -/* - DrawMainMenu(); -*/ - } + BackToFront(); } @@ -864,21 +815,12 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) } else { - local_player->leveldir_nr = leveldir_nr = y-3; + leveldir_nr = y-3; + level_nr = + getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename); SaveLevelSetup(); - /* - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); - */ - - -#if 0 - CheckCheat(); -#endif - - TapeErase(); LoadLevelTape(level_nr); @@ -887,6 +829,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) redraw = TRUE; } } + BackToFront(); if (game_status==CHOOSELEVEL) @@ -940,68 +883,33 @@ void HandleHallOfFame(int button) void DrawSetupScreen() { int i; - - -#if 0 - static struct setup - { - unsigned int bit; - char *text, *mode[2]; - int color[2]; - } setup[] = - { - {SETUP_SOUND, "Sound:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOUND_LOOPS, " Sound Loops:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOUND_MUSIC, " Game Music:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_TOONS, "Toons:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_DIRECT_DRAW, "Buffered gfx:",{"off","on" }, {FC_BLUE,FC_YELLOW}}, - {SETUP_SCROLL_DELAY,"Scroll Delay:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_SOFT_SCROLL, "Soft Scroll.:",{"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_FADING, "Fading:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_QUICK_DOORS, "Quick Doors:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {SETUP_AUTO_RECORD, "Auto-Record:", {"on", "off"}, {FC_YELLOW,FC_BLUE}}, - {0, "Input Devices",{"", ""}, {0,0}}, - {0, "", {"", ""}, {0,0}}, - {0, "", {"", ""}, {0,0}}, - {0, "Exit", {"", ""}, {0,0}}, - {0, "Save and exit",{"", ""}, {0,0}} - }; -#endif - static struct setup { boolean *value; - char *text, *mode[2]; - int color[2]; + char *text; } setup_info[] = { - { &setup.sound_on, "Sound:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.sound_loops_on," Sound Loops:",{"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.sound_music_on," Game Music:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.toons_on, "Toons:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.direct_draw_on,"Buffered gfx:",{"off","on" },{FC_BLUE,FC_YELLOW}}, - { &setup.scroll_delay_on,"Scroll Delay:",{"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.soft_scrolling_on, "Soft Scroll.:",{"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.fading_on, "Fading:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.quick_doors,"Quick Doors:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, - { &setup.autorecord_on,"Auto-Record:", {"on", "off"},{FC_YELLOW,FC_BLUE}}, - { NULL, "Input Devices",{"", ""}, {0,0}}, - { NULL, "", {"", ""}, {0,0}}, - { NULL, "", {"", ""}, {0,0}}, - { NULL, "Exit", {"", ""}, {0,0}}, - { NULL, "Save and exit",{"", ""}, {0,0}} + { &setup.sound, "Sound:", }, + { &setup.sound_loops, " Sound Loops:" }, + { &setup.sound_music, " Game Music:" }, + { &setup.toons, "Toons:" }, + { &setup.double_buffering, "Buffered gfx:" }, + { &setup.scroll_delay, "Scroll Delay:" }, + { &setup.soft_scrolling, "Soft Scroll.:" }, + { &setup.fading, "Fading:" }, + { &setup.quick_doors, "Quick Doors:" }, + { &setup.autorecord, "Auto-Record:" }, + { &setup.team_mode, "Team-Mode:" }, + { NULL, "Input Devices" }, + { NULL, "" }, + { NULL, "Exit" }, + { NULL, "Save and exit" } }; CloseDoor(DOOR_CLOSE_2); ClearWindow(); DrawText(SX+16, SY+16, "SETUP",FS_BIG,FC_YELLOW); - - /* - printf("setup.sound_loops_on == %d\n", setup.sound_loops_on); - */ - - for(i=SETUP_SCREEN_POS_START;i<=SETUP_SCREEN_POS_END;i++) { int base = i - SETUP_SCREEN_POS_START; @@ -1012,21 +920,12 @@ void DrawSetupScreen() DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN); } -#if 0 - if (i < SETUP_SCREEN_POS_EMPTY1) - { - int setting_bit = setup_info[base].bit; - int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1); - } -#endif - if (setup_info[base].value) { int setting_value = *setup_info[base].value; - int setting_pos = (setting_value != 0 ? 0 : 1); - DrawText(SX+14*32, SY+i*32,setup_info[base].mode[setting_pos], - FS_BIG,setup_info[base].color[setting_pos]); + DrawText(SX+14*32, SY+i*32, (setting_value ? "on" : "off"), + FS_BIG, (setting_value ? FC_YELLOW : FC_BLUE)); } } @@ -1100,81 +999,82 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) if (y==3 && sound_status==SOUND_AVAILABLE) { - if (setup.sound_on) + if (setup.sound) { DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); DrawText(SX+14*32, SY+(yy+1)*32,"off",FS_BIG,FC_BLUE); DrawText(SX+14*32, SY+(yy+2)*32,"off",FS_BIG,FC_BLUE); - setup.sound_loops_on = FALSE; - setup.sound_music_on = FALSE; + setup.sound_loops = FALSE; + setup.sound_music = FALSE; } else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.sound_on = !setup.sound_on; + setup.sound = !setup.sound; } else if (y==4 && sound_loops_allowed) { - if (setup.sound_loops_on) + if (setup.sound_loops) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else { DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); DrawText(SX+14*32, SY+(yy-1)*32,"on ",FS_BIG,FC_YELLOW); - setup.sound_on = TRUE; + setup.sound = TRUE; } - setup.sound_loops_on = !setup.sound_loops_on; + setup.sound_loops = !setup.sound_loops; } else if (y==5 && sound_loops_allowed) { - if (setup.sound_music_on) + if (setup.sound_music) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else { DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); DrawText(SX+14*32, SY+(yy-2)*32,"on ",FS_BIG,FC_YELLOW); - setup.sound_on = TRUE; + setup.sound = TRUE; } - setup.sound_music_on = !setup.sound_music_on; + setup.sound_music = !setup.sound_music; } else if (y==6) { - if (setup.toons_on) + if (setup.toons) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.toons_on = !setup.toons_on; + setup.toons = !setup.toons; } else if (y==7) { - if (!setup.direct_draw_on) + if (setup.double_buffering) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.direct_draw_on = !setup.direct_draw_on; + setup.double_buffering = !setup.double_buffering; + setup.direct_draw = !setup.double_buffering; } else if (y==8) { - if (setup.scroll_delay_on) + if (setup.scroll_delay) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.scroll_delay_on = !setup.scroll_delay_on; + setup.scroll_delay = !setup.scroll_delay; } else if (y==9) { - if (setup.soft_scrolling_on) + if (setup.soft_scrolling) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.soft_scrolling_on = !setup.soft_scrolling_on; + setup.soft_scrolling = !setup.soft_scrolling; } else if (y==10) { - if (setup.fading_on) + if (setup.fading) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.fading_on = !setup.fading_on; + setup.fading = !setup.fading; } else if (y==11) { @@ -1186,13 +1086,21 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } else if (y==12) { - if (setup.autorecord_on) + if (setup.autorecord) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - setup.autorecord_on = !setup.autorecord_on; + setup.autorecord = !setup.autorecord; } else if (y==13) + { + if (setup.team_mode) + DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); + else + DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); + setup.team_mode = !setup.team_mode; + } + else if (y==14) { game_status = SETUPINPUT; DrawSetupInputScreen(); @@ -1202,16 +1110,12 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { if (y==pos_end) { - - SaveSetup(); - -#if 0 - SavePlayerInfo(PLAYER_SETUP); -#endif - + /* SaveJoystickData(); + */ + } game_status = MAINMENU; @@ -1247,6 +1151,45 @@ void DrawSetupInputScreen() HandleSetupInputScreen(0,0,0,0,MB_MENU_INITIALIZE); } +static int getJoystickNrFromDeviceName(char *device_name) +{ + char c; + int joystick_nr = 0; + + if (device_name == NULL || device_name[0] == '\0') + return 0; + + c = device_name[strlen(device_name) - 1]; + + if (c >= '0' && c <= '9') + joystick_nr = (int)(c - '0'); + + if (joystick_nr < 0 || joystick_nr >= MAX_PLAYERS) + joystick_nr = 0; + + return joystick_nr; +} + +static void setJoystickDeviceToNr(char *device_name, int device_nr) +{ + if (device_name == NULL) + return; + + if (device_nr < 0 || device_nr >= MAX_PLAYERS) + device_nr = 0; + + if (strlen(device_name) > 1) + { + char c1 = device_name[strlen(device_name) - 1]; + char c2 = device_name[strlen(device_name) - 2]; + + if (c1 >= '0' && c1 <= '9' && !(c2 >= '0' && c2 <= '9')) + device_name[strlen(device_name) - 1] = '0' + (char)(device_nr % 10); + } + else + strcpy(device_name, joystick_device_name[device_nr]); +} + static void drawPlayerSetupInputInfo(int player_nr) { int i; @@ -1264,6 +1207,13 @@ static void drawPlayerSetupInputInfo(int player_nr) { &custom_key.snap, "Button 1" }, { &custom_key.bomb, "Button 2" } }; + static char *joystick_name[MAX_PLAYERS] = + { + "Joystick1", + "Joystick2", + "Joystick3", + "Joystick4" + }; custom_key = setup.input[player_nr].key; @@ -1272,9 +1222,10 @@ static void drawPlayerSetupInputInfo(int player_nr) if (setup.input[player_nr].use_joystick) { + char *device_name = setup.input[player_nr].joy.device_name; + DrawText(SX+8*32, SY+3*32, - (setup.input[player_nr].joystick_nr == 0 ? - "Joystick1" : "Joystick2"), + joystick_name[getJoystickNrFromDeviceName(device_name)], FS_BIG, FC_YELLOW); DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN); } @@ -1376,7 +1327,7 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) { static long delay = 0; - if (!DelayReached(&delay,150)) + if (!DelayReached(&delay, 150)) goto out; player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS; @@ -1399,6 +1350,33 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) { if (y == 4) { + char *device_name = setup.input[player_nr].joy.device_name; + + if (!setup.input[player_nr].use_joystick) + { + int new_device_nr = (dx >= 0 ? 0 : MAX_PLAYERS - 1); + + setJoystickDeviceToNr(device_name, new_device_nr); + setup.input[player_nr].use_joystick = TRUE; + } + else + { + int device_nr = getJoystickNrFromDeviceName(device_name); + int new_device_nr = device_nr + (dx >= 0 ? +1 : -1); + + if (new_device_nr < 0 || new_device_nr >= MAX_PLAYERS) + setup.input[player_nr].use_joystick = FALSE; + else + setJoystickDeviceToNr(device_name, new_device_nr); + } + + + /* + InitJoysticks(); + */ + + +#if 0 int one_joystick_nr = (dx >= 0 ? 0 : 1); int the_other_joystick_nr = (dx >= 0 ? 1 : 0); @@ -1414,13 +1392,17 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) setup.input[player_nr].use_joystick = TRUE; setup.input[player_nr].joystick_nr = one_joystick_nr; } +#endif drawPlayerSetupInputInfo(player_nr); } else if (y == 5) { if (setup.input[player_nr].use_joystick) - CalibrateJoystick(setup.input[player_nr].joystick_nr); + { + InitJoysticks(); + CalibrateJoystick(player_nr); + } else CustomizeKeyboard(player_nr); @@ -1428,6 +1410,8 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) } else if (y == pos_end) { + InitJoysticks(); + game_status = SETUP; DrawSetupScreen(); redraw = TRUE; @@ -1569,7 +1553,7 @@ void CustomizeKeyboard(int player_nr) DrawSetupInputScreen(); } -void CalibrateJoystick(int joystick_nr) +void CalibrateJoystick(int player_nr) { #ifdef __FreeBSD__ struct joystick joy_ctrl; @@ -1586,6 +1570,7 @@ void CalibrateJoystick(int joystick_nr) char joy_nr[4]; #endif + int joystick_fd = stored_player[player_nr].joystick_fd; int new_joystick_xleft = 128, new_joystick_xright = 128; int new_joystick_yupper = 128, new_joystick_ylower = 128; int new_joystick_xmiddle, new_joystick_ymiddle; @@ -1598,6 +1583,9 @@ void CalibrateJoystick(int joystick_nr) if (joystick_status == JOYSTICK_OFF) return; + if (!setup.input[player_nr].use_joystick || joystick_fd < 0) + return; + ClearWindow(); DrawText(SX, SY + 6*32, " ROTATE JOYSTICK ",FS_BIG,FC_YELLOW); DrawText(SX, SY + 7*32, "IN ALL DIRECTIONS",FS_BIG,FC_YELLOW); @@ -1614,7 +1602,7 @@ void CalibrateJoystick(int joystick_nr) } } - joy = Joystick(); + joy = Joystick(player_nr); last_x = (joy & JOY_LEFT ? -1 : joy & JOY_RIGHT ? +1 : 0); last_y = (joy & JOY_UP ? -1 : joy & JOY_DOWN ? +1 : 0); DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT); @@ -1627,7 +1615,7 @@ void CalibrateJoystick(int joystick_nr) joy_ctrl.buttons = 0; #endif - while(Joystick() & JOY_BUTTON); + while(Joystick(player_nr) & JOY_BUTTON); InitAnimation(); @@ -1669,7 +1657,7 @@ void CalibrateJoystick(int joystick_nr) } } - if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) + if (read(joystick_fd, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) { joystick_status = JOYSTICK_OFF; goto error_out; @@ -1685,16 +1673,16 @@ void CalibrateJoystick(int joystick_nr) new_joystick_ymiddle = new_joystick_yupper + (new_joystick_ylower - new_joystick_yupper) / 2; - joystick[joystick_nr].xleft = new_joystick_xleft; - joystick[joystick_nr].yupper = new_joystick_yupper; - joystick[joystick_nr].xright = new_joystick_xright; - joystick[joystick_nr].ylower = new_joystick_ylower; - joystick[joystick_nr].xmiddle = new_joystick_xmiddle; - joystick[joystick_nr].ymiddle = new_joystick_ymiddle; + setup.input[player_nr].joy.xleft = new_joystick_xleft; + setup.input[player_nr].joy.yupper = new_joystick_yupper; + setup.input[player_nr].joy.xright = new_joystick_xright; + setup.input[player_nr].joy.ylower = new_joystick_ylower; + setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle; + setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle; CheckJoystickData(); - joy = Joystick(); + joy = Joystick(player_nr); if (joy & JOY_BUTTON && check_remaining == 0) result = 1; @@ -1718,13 +1706,13 @@ void CalibrateJoystick(int joystick_nr) #if 0 printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n", - joystick[joystick_nr].xleft, - joystick[joystick_nr].xmiddle, - joystick[joystick_nr].xright); + setup.input[player_nr].joy.xleft, + setup.input[player_nr].joy.xmiddle, + setup.input[player_nr].joy.xright); printf("UP / MIDDLE / DOWN == %d / %d / %d\n", - joystick[joystick_nr].yupper, - joystick[joystick_nr].ymiddle, - joystick[joystick_nr].ylower); + setup.input[player_nr].joy.yupper, + setup.input[player_nr].joy.ymiddle, + setup.input[player_nr].joy.ylower); #endif } @@ -1738,7 +1726,7 @@ void CalibrateJoystick(int joystick_nr) StopAnimation(); DrawSetupInputScreen(); - while(Joystick() & JOY_BUTTON); + while(Joystick(player_nr) & JOY_BUTTON); return; error_out: @@ -1751,6 +1739,10 @@ void CalibrateJoystick(int joystick_nr) DrawSetupInputScreen(); } + + +#if 0 + void CalibrateJoystick_OLD() { #ifdef __FreeBSD__ @@ -1862,12 +1854,12 @@ void CalibrateJoystick_OLD() new_joystick_xmiddle = joy_ctrl.x; new_joystick_ymiddle = joy_ctrl.y; - joystick[joystick_nr].xleft = new_joystick_xleft; - joystick[joystick_nr].yupper = new_joystick_yupper; - joystick[joystick_nr].xright = new_joystick_xright; - joystick[joystick_nr].ylower = new_joystick_ylower; - joystick[joystick_nr].xmiddle = new_joystick_xmiddle; - joystick[joystick_nr].ymiddle = new_joystick_ymiddle; + setup.input[player_nr].joy.xleft = new_joystick_xleft; + setup.input[player_nr].joy.yupper = new_joystick_yupper; + setup.input[player_nr].joy.xright = new_joystick_xright; + setup.input[player_nr].joy.ylower = new_joystick_ylower; + setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle; + setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle; CheckJoystickData(); @@ -1923,6 +1915,10 @@ void CalibrateJoystick_OLD() DrawSetupScreen(); } +#endif + + + void HandleGameActions() { if (game_status != PLAYING) @@ -2049,15 +2045,15 @@ void HandleSoundButtons(int mx, int my, int button) switch(CheckSoundButtons(mx,my,button)) { case BUTTON_SOUND_MUSIC: - if (setup.sound_music_on) + if (setup.sound_music) { - setup.sound_music_on = FALSE; + setup.sound_music = FALSE; FadeSound(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF); } else if (sound_loops_allowed) { - setup.sound_on = setup.sound_music_on = TRUE; + setup.sound = setup.sound_music = TRUE; PlaySoundLoop(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON); } @@ -2066,14 +2062,14 @@ void HandleSoundButtons(int mx, int my, int button) break; case BUTTON_SOUND_LOOPS: - if (setup.sound_loops_on) + if (setup.sound_loops) { - setup.sound_loops_on = FALSE; + setup.sound_loops = FALSE; DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF); } else if (sound_loops_allowed) { - setup.sound_on = setup.sound_loops_on = TRUE; + setup.sound = setup.sound_loops = TRUE; DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON); } else @@ -2081,14 +2077,14 @@ void HandleSoundButtons(int mx, int my, int button) break; case BUTTON_SOUND_SIMPLE: - if (setup.sound_simple_on) + if (setup.sound_simple) { - setup.sound_simple_on = FALSE; + setup.sound_simple = FALSE; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF); } else if (sound_status==SOUND_AVAILABLE) { - setup.sound_on = setup.sound_simple_on = TRUE; + setup.sound = setup.sound_simple = TRUE; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON); } else @@ -2143,30 +2139,6 @@ void HandleGameButtons(int mx, int my, int button) } else TapeTogglePause(); - - /* - if (tape.pausing) - { - if (options.network) - SendToServer_ContinuePlaying(); - else - { - tape.pausing = FALSE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0); - } - } - else - { - if (options.network) - SendToServer_PausePlaying(); - else - { - tape.pausing = TRUE; - DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0); - } - } - */ - break; case BUTTON_GAME_PLAY: