X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=68132cf55e22692577af7ad39af0bee4669f377e;hb=82b1f76754f039e4ee151c7da7c49819c7310546;hp=3a9dda073371ed874ba9ce78d515170baf422921;hpb=5883ca32c052dc4114a283146bd1f0e300d23446;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 3a9dda07..68132cf5 100644 --- a/src/screens.c +++ b/src/screens.c @@ -70,10 +70,22 @@ void DrawMainMenu() DrawGraphic(14,3,GFX_PFEIL_R); DrawText(SX+40+16,SY+326,"A Game by Artsoft Entertainment",FS_SMALL,FC_BLUE); + + /* DrawText(SX+40+16,SY+344,"Graphics: Deluxe Paint IV Amiga", FS_SMALL,FC_BLUE); DrawText(SX+60+16,SY+362,"Sounds: AudioMaster IV Amiga", FS_SMALL,FC_BLUE); + */ + + if (leveldir[leveldir_nr].name) + { + int len = strlen(leveldir[leveldir_nr].name); + int lxpos = SX+(SXSIZE-len*FONT4_XSIZE)/2; + int lypos = SY+352; + + DrawText(lxpos,lypos,leveldir[leveldir_nr].name,FS_SMALL,FC_SPECIAL2); + } FadeToFront(); InitAnimation(); @@ -151,9 +163,6 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) level_nr = new_level_nr; - if (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, @@ -194,7 +203,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (num_leveldirs) { game_status = CHOOSELEVEL; - SavePlayerInfo(PLAYER_LEVEL); + SaveLevelSetup(); DrawChooseLevel(); } } @@ -235,7 +244,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y==10) { - SavePlayerInfo(PLAYER_LEVEL); + SaveLevelSetup(); if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } @@ -683,22 +692,6 @@ void HandleHelpScreen(int button) BackToFront(); } -void CheckCheat() -{ - int old_handicap = local_player->handicap; - -#if 0 - if (!strcmp(local_player->alias_name,"Artsoft")) -#endif - local_player->handicap = leveldir[leveldir_nr].levels-1; - - if (local_player->handicap != old_handicap) - { - SavePlayerInfo(PLAYER_LEVEL); - level_nr = local_player->handicap; - } -} - void HandleTypeName(int newxpos, KeySym key) { static int xpos = 0, ypos = 2; @@ -744,15 +737,11 @@ void HandleTypeName(int newxpos, KeySym key) { 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(); + SaveSetup(); game_status = MAINMENU; -/* - DrawMainMenu(); -*/ - } + BackToFront(); } @@ -831,10 +820,8 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) } else { - local_player->leveldir_nr = leveldir_nr = y-3; - LoadPlayerInfo(PLAYER_LEVEL); - SavePlayerInfo(PLAYER_SETUP); - CheckCheat(); + leveldir_nr = y-3; + SaveLevelSetup(); TapeErase(); LoadLevelTape(level_nr); @@ -844,6 +831,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) redraw = TRUE; } } + BackToFront(); if (game_status==CHOOSELEVEL) @@ -899,26 +887,25 @@ void DrawSetupScreen() int i; static struct setup { - unsigned int bit; + boolean *value; char *text, *mode[2]; - int color[2]; - } setup[] = + } setup_info[] = { - {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}} + { &setup.sound_on, "Sound:", { "on", "off" } }, + { &setup.sound_loops_on, " Sound Loops:",{ "on", "off" } }, + { &setup.sound_music_on, " Game Music:", { "on", "off" } }, + { &setup.toons_on, "Toons:", { "on", "off" } }, + { &setup.direct_draw_on, "Buffered gfx:",{ "off","on" } }, + { &setup.scroll_delay_on, "Scroll Delay:",{ "on", "off" } }, + { &setup.soft_scrolling_on, "Soft Scroll.:",{ "on", "off" } }, + { &setup.fading_on, "Fading:", { "on", "off" } }, + { &setup.quick_doors, "Quick Doors:", { "on", "off" } }, + { &setup.autorecord_on, "Auto-Record:", { "on", "off" } }, + { NULL, "Input Devices",{ "", "" } }, + { NULL, "", { "", "" } }, + { NULL, "", { "", "" } }, + { NULL, "Exit", { "", "" } }, + { NULL, "Save and exit",{ "", "" } } }; CloseDoor(DOOR_CLOSE_2); @@ -932,15 +919,17 @@ void DrawSetupScreen() if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2)) { DrawGraphic(0,i,GFX_KUGEL_BLAU); - DrawText(SX+32,SY+i*32, setup[base].text, FS_BIG,FC_GREEN); + DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN); } - if (i < SETUP_SCREEN_POS_EMPTY1) + if (setup_info[base].value) { - int setting_bit = setup[base].bit; - 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]); + int setting_value = *setup_info[base].value; + int setting_pos = (setting_value != 0 ? 0 : 1); + int fc_on = (strcmp(setup_info[base].mode[setting_pos], "on") == 0); + + DrawText(SX+14*32, SY+i*32, setup_info[base].mode[setting_pos], + FS_BIG, (fc_on ? FC_YELLOW : FC_BLUE)); } } @@ -1014,97 +1003,97 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) if (y==3 && sound_status==SOUND_AVAILABLE) { - if (SETUP_SOUND_ON(local_player->setup)) + if (setup.sound_on) { 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); - local_player->setup &= ~SETUP_SOUND_LOOPS; - local_player->setup &= ~SETUP_SOUND_MUSIC; + setup.sound_loops_on = FALSE; + setup.sound_music_on = FALSE; } else DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); - local_player->setup ^= SETUP_SOUND; + setup.sound_on = !setup.sound_on; } else if (y==4 && sound_loops_allowed) { - if (SETUP_SOUND_LOOPS_ON(local_player->setup)) + if (setup.sound_loops_on) 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); - local_player->setup |= SETUP_SOUND; + setup.sound_on = TRUE; } - local_player->setup ^= SETUP_SOUND_LOOPS; + setup.sound_loops_on = !setup.sound_loops_on; } else if (y==5 && sound_loops_allowed) { - if (SETUP_SOUND_MUSIC_ON(local_player->setup)) + if (setup.sound_music_on) 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); - local_player->setup |= SETUP_SOUND; + setup.sound_on = TRUE; } - local_player->setup ^= SETUP_SOUND_MUSIC; + setup.sound_music_on = !setup.sound_music_on; } else if (y==6) { - if (SETUP_TOONS_ON(local_player->setup)) + if (setup.toons_on) 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); - local_player->setup ^= SETUP_TOONS; + setup.toons_on = !setup.toons_on; } else if (y==7) { - if (!SETUP_DIRECT_DRAW_ON(local_player->setup)) + if (!setup.direct_draw_on) 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); - local_player->setup ^= SETUP_DIRECT_DRAW; + setup.direct_draw_on = !setup.direct_draw_on; } else if (y==8) { - if (SETUP_SCROLL_DELAY_ON(local_player->setup)) + if (setup.scroll_delay_on) 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); - local_player->setup ^= SETUP_SCROLL_DELAY; + setup.scroll_delay_on = !setup.scroll_delay_on; } else if (y==9) { - if (SETUP_SOFT_SCROLL_ON(local_player->setup)) + if (setup.soft_scrolling_on) 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); - local_player->setup ^= SETUP_SOFT_SCROLL; + setup.soft_scrolling_on = !setup.soft_scrolling_on; } else if (y==10) { - if (SETUP_FADING_ON(local_player->setup)) + if (setup.fading_on) 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); - local_player->setup ^= SETUP_FADING; + setup.fading_on = !setup.fading_on; } else if (y==11) { - if (SETUP_QUICK_DOORS_ON(local_player->setup)) + if (setup.quick_doors) 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); - local_player->setup ^= SETUP_QUICK_DOORS; + setup.quick_doors = !setup.quick_doors; } else if (y==12) { - if (SETUP_AUTO_RECORD_ON(local_player->setup)) + if (setup.autorecord_on) 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); - local_player->setup ^= SETUP_AUTO_RECORD; + setup.autorecord_on = !setup.autorecord_on; } else if (y==13) { @@ -1116,7 +1105,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { if (y==pos_end) { - SavePlayerInfo(PLAYER_SETUP); + SaveSetup(); SaveJoystickData(); } @@ -1157,34 +1146,29 @@ static void drawPlayerSetupInputInfo(int player_nr) { int i; static struct SetupKeyboardInfo custom_key; - static KeySym *key[] = + static struct { - &custom_key.left, - &custom_key.right, - &custom_key.up, - &custom_key.down, - &custom_key.snap, - &custom_key.bomb - }; - static char *joy_text[] = + KeySym *keysym; + char *text; + } custom[] = { - "Joystick Left", - "Joystick Right", - "Joystick Up", - "Joystick Down", - "Button 1", - "Button 2", + { &custom_key.left, "Joystick Left" }, + { &custom_key.right, "Joystick Right" }, + { &custom_key.up, "Joystick Up" }, + { &custom_key.down, "Joystick Down" }, + { &custom_key.snap, "Button 1" }, + { &custom_key.bomb, "Button 2" } }; - custom_key = setup.key_input[player_nr]; + custom_key = setup.input[player_nr].key; DrawText(SX+11*32, SY+2*32, int2str(player_nr + 1, 1), FS_BIG, FC_RED); DrawGraphic(8, 2, GFX_SPIELER1 + player_nr); - if (setup.joy_input[player_nr].use_joystick) + if (setup.input[player_nr].use_joystick) { DrawText(SX+8*32, SY+3*32, - (setup.joy_input[player_nr].joystick_nr == 0 ? + (setup.input[player_nr].joystick_nr == 0 ? "Joystick1" : "Joystick2"), FS_BIG, FC_YELLOW); DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN); @@ -1214,9 +1198,9 @@ static void drawPlayerSetupInputInfo(int player_nr) DrawText(SX + 3*32, SY + ypos*32, " ", FS_BIG, FC_YELLOW); DrawText(SX + 3*32, SY + ypos*32, - (setup.joy_input[player_nr].use_joystick ? - joy_text[i] : - getKeySymName(*key[i])), + (setup.input[player_nr].use_joystick ? + custom[i].text : + getKeyNameFromKeySym(*custom[i].keysym)), FS_BIG, FC_YELLOW); } } @@ -1313,25 +1297,25 @@ void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button) int one_joystick_nr = (dx >= 0 ? 0 : 1); int the_other_joystick_nr = (dx >= 0 ? 1 : 0); - if (setup.joy_input[player_nr].use_joystick) + if (setup.input[player_nr].use_joystick) { - if (setup.joy_input[player_nr].joystick_nr == one_joystick_nr) - setup.joy_input[player_nr].joystick_nr = the_other_joystick_nr; + if (setup.input[player_nr].joystick_nr == one_joystick_nr) + setup.input[player_nr].joystick_nr = the_other_joystick_nr; else - setup.joy_input[player_nr].use_joystick = FALSE; + setup.input[player_nr].use_joystick = FALSE; } else { - setup.joy_input[player_nr].use_joystick = TRUE; - setup.joy_input[player_nr].joystick_nr = one_joystick_nr; + setup.input[player_nr].use_joystick = TRUE; + setup.input[player_nr].joystick_nr = one_joystick_nr; } drawPlayerSetupInputInfo(player_nr); } else if (y == 5) { - if (setup.joy_input[player_nr].use_joystick) - CalibrateJoystick(setup.joy_input[player_nr].joystick_nr); + if (setup.input[player_nr].use_joystick) + CalibrateJoystick(setup.input[player_nr].joystick_nr); else CustomizeKeyboard(player_nr); @@ -1374,7 +1358,7 @@ void CustomizeKeyboard(int player_nr) }; /* read existing key bindings from player setup */ - custom_key = setup.key_input[player_nr]; + custom_key = setup.input[player_nr].key; ClearWindow(); DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW); @@ -1388,7 +1372,8 @@ void CustomizeKeyboard(int player_nr) DrawText(SX, SY + (2+2*step_nr+1)*32, "Key:", FS_BIG, FC_RED); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, - getKeySymName(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE); + getKeyNameFromKeySym(*customize_step[step_nr].keysym), + FS_BIG, FC_BLUE); while(!finished) { @@ -1427,7 +1412,7 @@ void CustomizeKeyboard(int player_nr) DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, " ", FS_BIG, FC_YELLOW); DrawText(SX + 4*32, SY + (2+2*step_nr+1)*32, - getKeySymName(key), FS_BIG, FC_YELLOW); + getKeyNameFromKeySym(key), FS_BIG, FC_YELLOW); step_nr++; /* un-highlight last query */ @@ -1450,7 +1435,7 @@ void CustomizeKeyboard(int player_nr) DrawText(SX, SY+(2+2*step_nr+1)*32, "Key:", FS_BIG, FC_RED); DrawText(SX + 4*32, SY+(2+2*step_nr+1)*32, - getKeySymName(*customize_step[step_nr].keysym), + getKeyNameFromKeySym(*customize_step[step_nr].keysym), FS_BIG, FC_BLUE); } break; @@ -1473,7 +1458,7 @@ void CustomizeKeyboard(int player_nr) } /* write new key bindings back to player setup */ - setup.key_input[player_nr] = custom_key; + setup.input[player_nr].key = custom_key; StopAnimation(); DrawSetupInputScreen(); @@ -1678,7 +1663,7 @@ void CalibrateJoystick_OLD() char joy_nr[4]; #endif - int joystick_nr = setup.joy_input[0].joystick_nr; + int joystick_nr = setup.input[0].joystick_nr; int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle; int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle; @@ -1833,7 +1818,7 @@ void CalibrateJoystick_OLD() DrawSetupScreen(); } -void HandleGameActions(byte player_action) +void HandleGameActions() { if (game_status != PLAYING) return; @@ -1844,7 +1829,7 @@ void HandleGameActions(byte player_action) if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) TapeStop(); - GameActions(player_action); + GameActions(); BackToFront(); } @@ -1962,14 +1947,12 @@ void HandleSoundButtons(int mx, int my, int button) if (setup.sound_music_on) { setup.sound_music_on = FALSE; - local_player->setup &= ~SETUP_SOUND_MUSIC; 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; - local_player->setup |= (SETUP_SOUND | SETUP_SOUND_MUSIC); PlaySoundLoop(background_loop[level_nr % num_bg_loops]); DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON); } @@ -1981,13 +1964,11 @@ void HandleSoundButtons(int mx, int my, int button) if (setup.sound_loops_on) { setup.sound_loops_on = FALSE; - local_player->setup &= ~SETUP_SOUND_LOOPS; DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF); } else if (sound_loops_allowed) { setup.sound_on = setup.sound_loops_on = TRUE; - local_player->setup |= (SETUP_SOUND | SETUP_SOUND_LOOPS); DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON); } else @@ -1998,13 +1979,11 @@ void HandleSoundButtons(int mx, int my, int button) if (setup.sound_simple_on) { setup.sound_simple_on = FALSE; - local_player->setup &= ~SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF); } else if (sound_status==SOUND_AVAILABLE) { setup.sound_on = setup.sound_simple_on = TRUE; - local_player->setup |= SETUP_SOUND; DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON); } else @@ -2059,30 +2038,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: