X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=425c35e86f014dfbc4c079166e7bb76c1d7ccdd7;hb=cee436b68cda95e13abc810235a11ce94bc79c95;hp=cc8b70356353ec958517582da0f9d18fcd7326dc;hpb=b5f59ffe4c22ffd70a346661baeba466c3ae40db;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index cc8b7035..425c35e8 100644 --- a/src/screens.c +++ b/src/screens.c @@ -201,13 +201,8 @@ static void PlayMenuMusic() void DrawHeadline() { - int text1_width = getTextWidth(PROGRAM_TITLE_STRING, FONT_TITLE_1); - int text2_width = getTextWidth(PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2); - int x1 = SX + (SXSIZE - text1_width) / 2; - int x2 = SX + (SXSIZE - text2_width) / 2; - - DrawText(x1, SY + 8, PROGRAM_TITLE_STRING, FONT_TITLE_1); - DrawText(x2, SY + 46, PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2); + DrawTextSCentered(8, FONT_TITLE_1, PROGRAM_TITLE_STRING); + DrawTextSCentered(46, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING); } static void ToggleFullscreenIfNeeded() @@ -238,8 +233,7 @@ void DrawMainMenu() { static LevelDirTree *leveldir_last_valid = NULL; char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:"); - int name_width = getTextWidth("Name:", FONT_MENU_1); - int level_width = getTextWidth("Level:", FONT_MENU_1); + int name_width, level_width; int i; UnmapAllGadgets(); @@ -276,7 +270,7 @@ void DrawMainMenu() leveldir_last_valid = leveldir_current; /* needed if last screen (level choice) changed graphics, sounds or music */ - ReloadCustomArtwork(); + ReloadCustomArtwork(0); #ifdef TARGET_SDL SetDrawtoField(DRAW_BACKBUFFER); @@ -306,6 +300,10 @@ void DrawMainMenu() DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1); DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1); + /* calculated after (possible) reload of custom artwork */ + name_width = getTextWidth(name_text, FONT_MENU_1); + level_width = getTextWidth("Level:", FONT_MENU_1); + DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT_1); DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3), FONT_VALUE_1); @@ -330,7 +328,7 @@ void DrawMainMenu() drawCursorXY(level_width/32 + 4, 1, IMG_MENU_BUTTON_LEFT); drawCursorXY(level_width/32 + 8, 1, IMG_MENU_BUTTON_RIGHT); - DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FONT_TITLE_2); + DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment"); FadeToFront(); InitAnimation(); @@ -497,7 +495,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (setup.autorecord) TapeStartRecording(); -#if defined(PLATFORM_UNIX) +#if defined(NETWORK_AVALIABLE) if (options.network) SendToServer_StartPlaying(); else @@ -997,7 +995,8 @@ void HandleInfoScreen_Music(int button) int y = 0; if (button != MB_MENU_INITIALIZE) - list = list->next; + if (list != NULL) + list = list->next; if (list == NULL) { @@ -1072,7 +1071,7 @@ void HandleInfoScreen_Music(int button) "Press any key or button for next page"); } - if (list->is_sound && sound_info[list->music].loop) + if (list != NULL && list->is_sound && sound_info[list->music].loop) PlaySoundLoop(list->music); } @@ -1870,7 +1869,7 @@ static void execSetupArtwork() setup.music_set = artwork.mus_current->identifier; /* needed if last screen (setup choice) changed graphics, sounds or music */ - ReloadCustomArtwork(); + ReloadCustomArtwork(0); /* needed for displaying artwork name instead of artwork identifier */ graphics_set_name = artwork.gfx_current->name; @@ -1953,7 +1952,9 @@ static struct TokenInfo setup_info_game[] = static struct TokenInfo setup_info_editor[] = { +#if 0 { TYPE_STRING, NULL, "Offer Special Elements:"}, +#endif { TYPE_SWITCH, &setup.editor.el_boulderdash, "BoulderDash:" }, { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, { TYPE_SWITCH, &setup.editor.el_more, "More:" }, @@ -2209,8 +2210,14 @@ static void DrawSetupScreen_Generic() (value_ptr == &setup.fullscreen && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; +#if 0 + if (setup_info[i].type & TYPE_STRING || + (setup_info[i].type & TYPE_SWITCH && setup_mode == SETUP_MODE_EDITOR)) + font_nr = FONT_MENU_2; +#else if (setup_info[i].type & TYPE_STRING) font_nr = FONT_MENU_2; +#endif DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr); @@ -2388,7 +2395,7 @@ static void drawPlayerSetupInputInfo(int player_nr) { &custom_key.up, "Joystick Up" }, { &custom_key.down, "Joystick Down" }, { &custom_key.snap, "Button 1" }, - { &custom_key.bomb, "Button 2" } + { &custom_key.drop, "Button 2" } }; static char *joystick_name[MAX_PLAYERS] = { @@ -2402,6 +2409,8 @@ static void drawPlayerSetupInputInfo(int player_nr) DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE); #if 1 + ClearRectangleOnBackground(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY, + TILEX, TILEY); DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); #else @@ -2433,7 +2442,7 @@ static void drawPlayerSetupInputInfo(int player_nr) DrawText(mSX+2*32, mSY+8*32, ":", FONT_VALUE_OLD); DrawText(mSX+2*32, mSY+9*32, ":", FONT_VALUE_OLD); DrawText(mSX+32, mSY+10*32, "Snap Field:", FONT_VALUE_OLD); - DrawText(mSX+32, mSY+12*32, "Place Bomb:", FONT_VALUE_OLD); + DrawText(mSX+32, mSY+12*32, "Drop Element:", FONT_VALUE_OLD); for (i = 0; i < 6; i++) { @@ -2579,12 +2588,12 @@ void CustomizeKeyboard(int player_nr) char *text; } customize_step[] = { - { &custom_key.left, "Move Left" }, - { &custom_key.right, "Move Right" }, - { &custom_key.up, "Move Up" }, - { &custom_key.down, "Move Down" }, - { &custom_key.snap, "Snap Field" }, - { &custom_key.bomb, "Place Bomb" } + { &custom_key.left, "Move Left" }, + { &custom_key.right, "Move Right" }, + { &custom_key.up, "Move Up" }, + { &custom_key.down, "Move Down" }, + { &custom_key.snap, "Snap Field" }, + { &custom_key.drop, "Drop Element" } }; /* read existing key bindings from player setup */ @@ -2935,17 +2944,35 @@ void HandleGameActions() if (game_status != GAME_MODE_PLAYING) return; - if (local_player->LevelSolved) - GameWon(); + /* !!! FIX THIS (START) !!! */ + if (level.file_info.type == LEVEL_FILE_TYPE_EM) + { + byte summarized_player_action = 0; + int i; - if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) - TapeStop(); + for (i = 0; i < MAX_PLAYERS; i++) + summarized_player_action |= stored_player[i].action; - GameActions(); - BackToFront(); + if (em_main_handle_game(summarized_player_action) != 0) + { + game_status = GAME_MODE_MAIN; + DrawMainMenu(); + } + } + else + { + if (local_player->LevelSolved) + GameWon(); + + if (AllPlayersGone && !TAPE_IS_STOPPED(tape)) + TapeStop(); - if (tape.auto_play && !tape.playing) - AutoPlayTape(); /* continue automatically playing next tape */ + GameActions(); + BackToFront(); + + if (tape.auto_play && !tape.playing) + AutoPlayTape(); /* continue automatically playing next tape */ + } } /* ---------- new screen button stuff -------------------------------------- */