X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=6fccd1dc8be066b53ce467c6bc540c3c54167495;hb=eae2f3467caaaf64a9370c1acd8cecf11fd58328;hp=3bf0c3005ca5fafb315e44c6fff9449a67c52fe9;hpb=78943068787ee6d63e1045df9d286d98b5a2912c;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 3bf0c300..6fccd1dc 100644 --- a/src/screens.c +++ b/src/screens.c @@ -28,18 +28,18 @@ /* for DrawSetupScreen(), HandleSetupScreen() */ #define SETUP_SCREEN_POS_START 2 -#define SETUP_SCREEN_POS_END 16 +#define SETUP_SCREEN_POS_END (SCR_FIELDY - 1) #define SETUP_SCREEN_POS_EMPTY1 (SETUP_SCREEN_POS_END - 2) #define SETUP_SCREEN_POS_EMPTY2 (SETUP_SCREEN_POS_END - 2) /* for HandleSetupInputScreen() */ #define SETUPINPUT_SCREEN_POS_START 2 -#define SETUPINPUT_SCREEN_POS_END 15 +#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 2) #define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3) #define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1) /* for HandleChooseLevel() */ -#define MAX_LEVEL_SERIES_ON_SCREEN 15 +#define MAX_LEVEL_SERIES_ON_SCREEN (SCR_FIELDY - 2) #ifdef MSDOS extern unsigned char get_ascii(KeySym); @@ -70,9 +70,16 @@ void DrawMainMenu() return; } + /* needed if last screen was the editor screen */ + UndrawSpecialEditorDoor(); + /* map gadgets for main menu screen */ MapTapeButtons(); + /* level_nr may have set to value over handicap with level editor */ + if (setup.handicap && level_nr > leveldir[leveldir_nr].handicap_level) + level_nr = leveldir[leveldir_nr].handicap_level; + GetPlayerConfig(); LoadLevel(level_nr); @@ -104,8 +111,8 @@ void DrawMainMenu() for(i=2; i<10; i++) DrawGraphic(0, i, GFX_KUGEL_BLAU); - DrawGraphic(10, 3, GFX_PFEIL_L); - DrawGraphic(14, 3, GFX_PFEIL_R); + DrawGraphic(10, 3, GFX_PFEIL_LEFT); + DrawGraphic(14, 3, GFX_PFEIL_RIGHT); DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FS_SMALL, FC_RED); @@ -130,7 +137,10 @@ void DrawMainMenu() OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); +#if 0 ClearEventQueue(); +#endif + } void HandleMainMenu(int mx, int my, int dx, int dy, int button) @@ -190,6 +200,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (new_level_nr > leveldir[leveldir_nr].last_level) new_level_nr = leveldir[leveldir_nr].last_level; + if (setup.handicap && new_level_nr > leveldir[leveldir_nr].handicap_level) + new_level_nr = leveldir[leveldir_nr].handicap_level; + if (old_level_nr == new_level_nr || !DelayReached(&level_delay, GADGET_FRAME_DELAY)) goto out; @@ -236,7 +249,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (num_leveldirs) { game_status = CHOOSELEVEL; - SaveLevelSetup(); + SaveLevelSetup_LastSeries(); + SaveLevelSetup_SeriesInfo(leveldir_nr); DrawChooseLevel(); } } @@ -270,6 +284,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) #endif { game_status = PLAYING; + StopAnimation(); InitGame(); } } @@ -280,7 +295,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (y == 10) { - SaveLevelSetup(); + SaveLevelSetup_LastSeries(); + SaveLevelSetup_SeriesInfo(leveldir_nr); if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) game_status = EXITGAME; } @@ -374,10 +390,10 @@ static int helpscreen_action[] = GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1, HA_NEXT, GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1, GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1, HA_NEXT, - GFX_MAULWURF_DOWN,4,2, - GFX_MAULWURF_UP,4,2, - GFX_MAULWURF_LEFT,4,2, - GFX_MAULWURF_RIGHT,4,2, HA_NEXT, + GFX_MOLE_DOWN,4,2, + GFX_MOLE_UP,4,2, + GFX_MOLE_LEFT,4,2, + GFX_MOLE_RIGHT,4,2, HA_NEXT, GFX_PINGUIN_DOWN,4,2, GFX_PINGUIN_UP,4,2, GFX_PINGUIN_LEFT,4,2, @@ -455,7 +471,7 @@ static char *helpscreen_eltext[][2] = {"Cruncher: Eats diamonds and you,", "if you're not careful"}, {"Cruncher (BD style):", "Eats almost everything"}, {"Robot: Tries to kill the player", ""}, - {"The mole: You must guide him savely","to the exit; he will follow you"}, + {"The mole: Eats the amoeba and turns","empty space into normal sand"}, {"The penguin: Guide him to the exit,","but keep him away from monsters!"}, {"The Pig: Harmless, but eats all", "gems it can get"}, {"The Dragon: Breathes fire,", "especially to some monsters"}, @@ -757,7 +773,7 @@ void HandleTypeName(int newxpos, KeySym key) } if (((key >= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) && - xpos < MAX_NAMELEN - 1) + xpos < MAX_PLAYER_NAME_LEN) { char ascii; @@ -807,25 +823,31 @@ void DrawChooseLevel() static void drawChooseLevelList(int first_entry, int num_page_entries) { int i; - char buffer[SCR_FIELDX]; + char buffer[SCR_FIELDX * 2]; ClearWindow(); DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN); for(i=0; i 0) - DrawGraphic(0, 1, GFX_PFEIL_O); + DrawGraphic(0, 1, GFX_PFEIL_UP); if (first_entry + num_page_entries < num_leveldirs) - DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_U); + DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_DOWN); } static void drawChooseLevelInfo(int leveldir_nr) @@ -833,9 +855,16 @@ static void drawChooseLevelInfo(int leveldir_nr) int x, last_redraw_mask = redraw_mask; XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32); + +#if 0 DrawTextFCentered(40, FC_RED, "%3d levels (%s)", leveldir[leveldir_nr].levels, leveldir[leveldir_nr].readonly ? "readonly" : "writable"); +#else + DrawTextFCentered(40, FC_RED, "%3d levels (%s)", + leveldir[leveldir_nr].levels, + leveldir[leveldir_nr].class_desc); +#endif /* let BackToFront() redraw only what is needed */ redraw_mask = last_redraw_mask | REDRAW_TILES; @@ -846,7 +875,7 @@ static void drawChooseLevelInfo(int leveldir_nr) void HandleChooseLevel(int mx, int my, int dx, int dy, int button) { static int choice = 3; - static int first_entry = 0; + static int first_entry = -1; static unsigned long choose_delay = 0; static int redraw = TRUE; int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32; @@ -860,17 +889,15 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { - redraw = TRUE; - choice = leveldir_nr + 3 - first_entry; - - if (choice > num_page_entries + 2) + if (first_entry == -1) { - choice = num_page_entries + 2; - first_entry = num_leveldirs - num_page_entries; + first_entry = MAX(0, leveldir_nr - num_page_entries + 1); + choice = leveldir_nr - first_entry + 3; } drawChooseLevelList(first_entry, num_page_entries); drawChooseLevelInfo(leveldir_nr); + redraw = TRUE; } if (redraw) @@ -890,7 +917,15 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) y = choice + dy; } else - x = y = 0; + x = y = 0; /* no action */ + + if (ABS(dy) == SCR_FIELDY) /* handle XK_Page_Up, XK_Page_Down */ + { + dy = SIGN(dy); + step = num_page_entries - 1; + x = 1; + y = (dy < 0 ? 2 : num_page_entries + 3); + } } if (x == 1 && y == 2) @@ -898,15 +933,12 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) if (first_entry > 0 && (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) { -#if 0 - first_entry--; -#else first_entry -= step; if (first_entry < 0) first_entry = 0; -#endif + drawChooseLevelList(first_entry, num_page_entries); - drawChooseLevelInfo(first_entry); + drawChooseLevelInfo(first_entry + choice - 3); DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); return; } @@ -916,15 +948,12 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) if (first_entry + num_page_entries < num_leveldirs && (dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY))) { -#if 0 - first_entry++; -#else first_entry += step; if (first_entry + num_page_entries > num_leveldirs) - first_entry = num_leveldirs - num_page_entries; -#endif + first_entry = MAX(0, num_leveldirs - num_page_entries); + drawChooseLevelList(first_entry, num_page_entries); - drawChooseLevelInfo(first_entry + num_page_entries - 1); + drawChooseLevelInfo(first_entry + choice - 3); DrawGraphic(0, choice - 1, GFX_KUGEL_ROT); return; } @@ -951,10 +980,10 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) else { leveldir_nr = first_entry + y - 3; - level_nr = - getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename); + LoadLevelSetup_SeriesInfo(leveldir_nr); - SaveLevelSetup(); + SaveLevelSetup_LastSeries(); + SaveLevelSetup_SeriesInfo(leveldir_nr); TapeErase(); game_status = MAINMENU; @@ -971,47 +1000,101 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button) void DrawHallOfFame(int highlight_position) { - int i; - UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); if (highlight_position < 0) LoadScore(level_nr); - ClearWindow(); + FadeToFront(); + InitAnimation(); + HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE); + PlaySound(SND_HALLOFFAME); +} + +static void drawHallOfFameList(int first_entry, int highlight_position) +{ + int i; + ClearWindow(); DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW); DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr); for(i=0; i 0) + { + first_entry -= step; + if (first_entry < 0) + first_entry = 0; + + drawHallOfFameList(first_entry, highlight_position); + return; + } + } + else if (dy > 0) + { + if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN < MAX_SCORE_ENTRIES) + { + first_entry += step; + if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN > MAX_SCORE_ENTRIES) + first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_LEVEL_SERIES_ON_SCREEN); + + drawHallOfFameList(first_entry, highlight_position); + return; + } + } + if (button_released) { FadeSound(SND_HALLOFFAME); game_status = MAINMENU; DrawMainMenu(); - BackToFront(); } - else + + BackToFront(); + + if (game_status == HALLOFFAME) DoAnimation(); } @@ -1027,14 +1110,18 @@ void DrawSetupScreen() { &setup.sound, "Sound:", }, { &setup.sound_loops, " Sound Loops:" }, { &setup.sound_music, " Game Music:" }, +#if 0 { &setup.toons, "Toons:" }, { &setup.double_buffering, "Buffered gfx:" }, +#endif { &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:" }, + { &setup.handicap, "Handicap:" }, + { &setup.time_limit, "Timelimit:" }, { NULL, "Input Devices" }, { NULL, "" }, { NULL, "Exit" }, @@ -1172,6 +1259,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) } setup.sound_music = !setup.sound_music; } + +#if 0 else if (y==6) { if (setup.toons) @@ -1195,7 +1284,9 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) setup.direct_draw = !setup.double_buffering; #endif } - else if (y==8) +#endif + + else if (y==6) { if (setup.scroll_delay) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1203,7 +1294,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.scroll_delay = !setup.scroll_delay; } - else if (y==9) + else if (y==7) { if (setup.soft_scrolling) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1211,7 +1302,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.soft_scrolling = !setup.soft_scrolling; } - else if (y==10) + else if (y==8) { if (setup.fading) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1219,7 +1310,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.fading = !setup.fading; } - else if (y==11) + else if (y==9) { if (setup.quick_doors) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1227,7 +1318,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.quick_doors = !setup.quick_doors; } - else if (y==12) + else if (y==10) { if (setup.autorecord) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1235,7 +1326,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.autorecord = !setup.autorecord; } - else if (y==13) + else if (y==11) { if (setup.team_mode) DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE); @@ -1243,6 +1334,22 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW); setup.team_mode = !setup.team_mode; } + else if (y==12) + { + if (setup.handicap) + 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.handicap = !setup.handicap; + } + else if (y==13) + { + if (setup.time_limit) + 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.time_limit = !setup.time_limit; + } else if (y==14) { game_status = SETUPINPUT; @@ -1287,8 +1394,8 @@ void DrawSetupInputScreen() DrawGraphic(0, 3, GFX_KUGEL_BLAU); DrawGraphic(0, 4, GFX_KUGEL_BLAU); DrawGraphic(0, 15, GFX_KUGEL_BLAU); - DrawGraphic(10, 2, GFX_PFEIL_L); - DrawGraphic(12, 2, GFX_PFEIL_R); + DrawGraphic(10, 2, GFX_PFEIL_LEFT); + DrawGraphic(12, 2, GFX_PFEIL_RIGHT); DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN); DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN); @@ -1368,10 +1475,10 @@ static void drawPlayerSetupInputInfo(int player_nr) } DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN); - DrawGraphic(1, 6, GFX_PFEIL_L); - DrawGraphic(1, 7, GFX_PFEIL_R); - DrawGraphic(1, 8, GFX_PFEIL_O); - DrawGraphic(1, 9, GFX_PFEIL_U); + DrawGraphic(1, 6, GFX_PFEIL_LEFT); + DrawGraphic(1, 7, GFX_PFEIL_RIGHT); + DrawGraphic(1, 8, GFX_PFEIL_UP); + DrawGraphic(1, 9, GFX_PFEIL_DOWN); DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE); DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE); DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE);