X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=9f0ec9f9961e0b20bf30e76a834f05a6894b062f;hb=34b9fd6b89ffe8fa0637840118b43e4d36bb1798;hp=13bf5fab725dc1a86485bb91f09a1a3f269d911b;hpb=e1e1f0e96140865d39f667f6af11ebec5e8c9cad;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 13bf5fab..9f0ec9f9 100644 --- a/src/screens.c +++ b/src/screens.c @@ -25,6 +25,10 @@ #include "joystick.h" #include "cartoons.h" +#ifdef MSDOS +extern unsigned char get_ascii(KeySym); +#endif + void DrawHeadline() { int x1 = SX+(SXSIZE - strlen(GAMETITLE_STRING) * FONT1_XSIZE) / 2; @@ -47,7 +51,7 @@ void DrawMainMenu() ClearWindow(); DrawHeadline(); DrawText(SX+32, SY+64, "Name:",FS_BIG,FC_GREEN); - DrawText(SX+192,SY+64, player.alias_name,FS_BIG,FC_RED); + DrawText(SX+192,SY+64, local_player->alias_name,FS_BIG,FC_RED); DrawText(SX+32, SY+96, "Level:",FS_BIG,FC_GREEN); DrawText(SX+352,SY+96, int2str(level_nr,3),FS_BIG, (level_nrleveldir[leveldir_nr].levels-1) new_level_nr = leveldir[leveldir_nr].levels-1; - if (old_level_nr==new_level_nr || !DelayReached(&level_delay,15)) + if (old_level_nr==new_level_nr || !DelayReached(&level_delay,150)) goto out; level_nr = new_level_nr; - if (level_nr>player.handicap) - level_nr = player.handicap; + if (level_nr > local_player->handicap) + level_nr = local_player->handicap; DrawTextExt(drawto,gc,SX+352,SY+96, int2str(level_nr,3), FS_BIG,FC_RED); DrawTextExt(window,gc,SX+352,SY+96, int2str(level_nr,3), FS_BIG,FC_RED); @@ -181,7 +185,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (y==3) { game_status = TYPENAME; - HandleTypeName(strlen(player.alias_name),0); + HandleTypeName(strlen(local_player->alias_name),0); } else if (y==4) { @@ -477,8 +481,7 @@ void DrawHelpScreenElAction(int start) } j++; - DrawGraphicExtHiRes(drawto,gc,xstart,ystart+(i-start)*ystep, - graphic+frame); + DrawGraphicExt(drawto, gc, xstart, ystart+(i-start)*ystep, graphic+frame); i++; } @@ -662,7 +665,7 @@ void HandleHelpScreen(int button) } else { - if (DelayReached(&hs_delay,GAME_FRAME_DELAY)) + if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2)) { if (helpscreen_statehandicap; - if (!strcmp(player.alias_name,"Artsoft")) - player.handicap = leveldir[leveldir_nr].levels-1; + if (!strcmp(local_player->alias_name,"Artsoft")) + local_player->handicap = leveldir[leveldir_nr].levels-1; - if (player.handicap != old_handicap) + if (local_player->handicap != old_handicap) { SavePlayerInfo(PLAYER_LEVEL); - level_nr = player.handicap; + level_nr = local_player->handicap; } } @@ -695,11 +698,12 @@ void HandleTypeName(int newxpos, KeySym key) if (newxpos) { xpos = newxpos; - DrawText(SX+6*32,SY+ypos*32,player.alias_name,FS_BIG,FC_YELLOW); + DrawText(SX+6*32, SY+ypos*32, local_player->alias_name, FS_BIG, FC_YELLOW); DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); return; } +#ifndef MSDOS if ((key>=XK_A && key<=XK_Z) || (key>=XK_a && key<=XK_z && xpos=XK_a && key<=XK_z) ascii = 'a'+(char)(key-XK_a); - player.alias_name[xpos] = ascii; - player.alias_name[xpos+1] = 0; +#else + if((ascii = get_ascii(key)) && xposalias_name[xpos] = ascii; + local_player->alias_name[xpos+1] = 0; xpos++; DrawTextExt(drawto,gc,SX+6*32,SY+ypos*32, - player.alias_name,FS_BIG,FC_YELLOW); + local_player->alias_name,FS_BIG,FC_YELLOW); DrawTextExt(window,gc,SX+6*32,SY+ypos*32, - player.alias_name,FS_BIG,FC_YELLOW); + local_player->alias_name,FS_BIG,FC_YELLOW); DrawGraphic(xpos+6,ypos,GFX_KUGEL_ROT); } else if ((key==XK_Delete || key==XK_BackSpace) && xpos>0) { xpos--; - player.alias_name[xpos] = 0; + local_player->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,player.alias_name,FS_BIG,FC_RED); + DrawText(SX+6*32,SY+ypos*32,local_player->alias_name,FS_BIG,FC_RED); DrawGraphic(xpos+6,ypos,GFX_LEERRAUM); SavePlayerInfo(PLAYER_SETUP); CheckCheat(); @@ -814,7 +822,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) } else { - player.leveldir_nr = leveldir_nr = y-3; + local_player->leveldir_nr = leveldir_nr = y-3; LoadPlayerInfo(PLAYER_LEVEL); SavePlayerInfo(PLAYER_SETUP); CheckCheat(); @@ -921,7 +929,7 @@ void DrawSetupScreen() if (i < SETUP_SCREEN_POS_EMPTY) { int setting_bit = setup[base].bit; - int setting_pos = ((player.setup & setting_bit) != 0 ? 0 : 1); + int setting_pos = ((local_player->setup & setting_bit) != 0 ? 0 : 1); DrawText(SX+14*32, SY+i*32,setup[base].mode[setting_pos], FS_BIG,setup[base].color[setting_pos]); } @@ -995,105 +1003,105 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) if (y==3 && sound_status==SOUND_AVAILABLE) { - if (SETUP_SOUND_ON(player.setup)) + if (SETUP_SOUND_ON(local_player->setup)) { 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); - player.setup &= ~SETUP_SOUND_LOOPS; - player.setup &= ~SETUP_SOUND_MUSIC; + local_player->setup &= ~SETUP_SOUND_LOOPS; + local_player->setup &= ~SETUP_SOUND_MUSIC; } else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - player.setup ^= SETUP_SOUND; + local_player->setup ^= SETUP_SOUND; } else if (y==4 && sound_loops_allowed) { - if (SETUP_SOUND_LOOPS_ON(player.setup)) + if (SETUP_SOUND_LOOPS_ON(local_player->setup)) 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); - player.setup |= SETUP_SOUND; + local_player->setup |= SETUP_SOUND; } - player.setup ^= SETUP_SOUND_LOOPS; + local_player->setup ^= SETUP_SOUND_LOOPS; } else if (y==5 && sound_loops_allowed) { - if (SETUP_SOUND_MUSIC_ON(player.setup)) + if (SETUP_SOUND_MUSIC_ON(local_player->setup)) 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); - player.setup |= SETUP_SOUND; + local_player->setup |= SETUP_SOUND; } - player.setup ^= SETUP_SOUND_MUSIC; + local_player->setup ^= SETUP_SOUND_MUSIC; } else if (y==6) { - if (SETUP_TOONS_ON(player.setup)) + if (SETUP_TOONS_ON(local_player->setup)) 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); - player.setup ^= SETUP_TOONS; + local_player->setup ^= SETUP_TOONS; } else if (y==7) { - if (!SETUP_DIRECT_DRAW_ON(player.setup)) + if (!SETUP_DIRECT_DRAW_ON(local_player->setup)) 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); - player.setup ^= SETUP_DIRECT_DRAW; + local_player->setup ^= SETUP_DIRECT_DRAW; } else if (y==8) { - if (SETUP_SCROLL_DELAY_ON(player.setup)) + if (SETUP_SCROLL_DELAY_ON(local_player->setup)) 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); - player.setup ^= SETUP_SCROLL_DELAY; + local_player->setup ^= SETUP_SCROLL_DELAY; } else if (y==9) { - if (SETUP_SOFT_SCROLL_ON(player.setup)) + if (SETUP_SOFT_SCROLL_ON(local_player->setup)) 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); - player.setup ^= SETUP_SOFT_SCROLL; + local_player->setup ^= SETUP_SOFT_SCROLL; } else if (y==10) { - if (SETUP_FADING_ON(player.setup)) + if (SETUP_FADING_ON(local_player->setup)) 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); - player.setup ^= SETUP_FADING; + local_player->setup ^= SETUP_FADING; } else if (y==11) { - if (SETUP_QUICK_DOORS_ON(player.setup)) + if (SETUP_QUICK_DOORS_ON(local_player->setup)) 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); - player.setup ^= SETUP_QUICK_DOORS; + local_player->setup ^= SETUP_QUICK_DOORS; } else if (y==12) { - if (SETUP_AUTO_RECORD_ON(player.setup)) + if (SETUP_AUTO_RECORD_ON(local_player->setup)) 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); - player.setup ^= SETUP_AUTO_RECORD; + local_player->setup ^= SETUP_AUTO_RECORD; } else if (y==13) { - if (SETUP_2ND_JOYSTICK_ON(player.setup)) + if (SETUP_2ND_JOYSTICK_ON(local_player->setup)) DrawText(SX+14*32, SY+yy*32,"1st",FS_BIG,FC_YELLOW); else DrawText(SX+14*32, SY+yy*32,"2nd",FS_BIG,FC_YELLOW); - player.setup ^= SETUP_2ND_JOYSTICK; + local_player->setup ^= SETUP_2ND_JOYSTICK; } else if (y==14) { @@ -1133,12 +1141,17 @@ void CalibrateJoystick() } joy_ctrl; #endif +#ifdef MSDOS + char joy_nr[4]; +#endif + int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle; int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle; if (joystick_status==JOYSTICK_OFF) goto error_out; +#ifndef MSDOS ClearWindow(); DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW); DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW); @@ -1162,7 +1175,7 @@ void CalibrateJoystick() joystick_status=JOYSTICK_OFF; goto error_out; } - Delay(10000); + Delay(10); } new_joystick_xleft = joy_ctrl.x; @@ -1191,7 +1204,7 @@ void CalibrateJoystick() joystick_status=JOYSTICK_OFF; goto error_out; } - Delay(10000); + Delay(10); } new_joystick_xright = joy_ctrl.x; @@ -1219,7 +1232,7 @@ void CalibrateJoystick() joystick_status=JOYSTICK_OFF; goto error_out; } - Delay(10000); + Delay(10); } new_joystick_xmiddle = joy_ctrl.x; @@ -1238,12 +1251,51 @@ void CalibrateJoystick() while(Joystick() & JOY_BUTTON); return; +#endif error_out: +#ifdef MSDOS + joy_nr[0] = '#'; + joy_nr[1] = SETUP_2ND_JOYSTICK_ON(local_player->setup)+49; + joy_nr[2] = '\0'; + + remove_joystick(); + ClearWindow(); + DrawText(SX+32, SY+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW); + DrawText(SX+16+7*32, SY+8*32, joy_nr, FS_BIG,FC_YELLOW); + DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW); + BackToFront(); + + for(clear_keybuf();!keypressed();); + install_joystick(JOY_TYPE_2PADS); + + ClearWindow(); + DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW); + DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW); + DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW); + BackToFront(); + + for(clear_keybuf();!keypressed();); + calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup)); + + ClearWindow(); + DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW); + DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW); + DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW); + BackToFront(); + + for(clear_keybuf();!keypressed();); + calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup)); + + DrawSetupScreen(); + return; +#endif + ClearWindow(); DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW); DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW); - Delay(3000000); + BackToFront(); + Delay(3000); DrawSetupScreen(); } @@ -1259,6 +1311,8 @@ void HandleGameActions() TapeStop(); GameActions(); + + BackToFront(); } void HandleVideoButtons(int mx, int my, int button) @@ -1362,14 +1416,14 @@ void HandleSoundButtons(int mx, int my, int button) if (sound_music_on) { sound_music_on = FALSE; - player.setup &= ~SETUP_SOUND_MUSIC; + local_player->setup &= ~SETUP_SOUND_MUSIC; FadeSound(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF); } else if (sound_loops_allowed) { sound_on = sound_music_on = TRUE; - player.setup |= (SETUP_SOUND | SETUP_SOUND_MUSIC); + local_player->setup |= (SETUP_SOUND | SETUP_SOUND_MUSIC); PlaySoundLoop(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON); } @@ -1380,13 +1434,13 @@ void HandleSoundButtons(int mx, int my, int button) if (sound_loops_on) { sound_loops_on = FALSE; - player.setup &= ~SETUP_SOUND_LOOPS; + local_player->setup &= ~SETUP_SOUND_LOOPS; DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF); } else if (sound_loops_allowed) { sound_on = sound_loops_on = TRUE; - player.setup |= (SETUP_SOUND | SETUP_SOUND_LOOPS); + local_player->setup |= (SETUP_SOUND | SETUP_SOUND_LOOPS); DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON); } else @@ -1396,13 +1450,13 @@ void HandleSoundButtons(int mx, int my, int button) if (sound_simple_on) { sound_simple_on = FALSE; - player.setup &= ~SETUP_SOUND; + local_player->setup &= ~SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF); } else if (sound_status==SOUND_AVAILABLE) { sound_on = sound_simple_on = TRUE; - player.setup |= SETUP_SOUND; + local_player->setup |= SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON); } else