X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=386094d46615c2a095d83a2b52e85b16c0eb3c78;hb=7cd6d9ecca4ccd4927eddc994b616569ef23b231;hp=a04d75dc3e6b204e7538d9c384ccd323ea8a62fe;hpb=b81f28710057e7d84528b65b92e9b4d1aaadab6c;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index a04d75dc..386094d4 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2001 Artsoft Entertainment * +* (c) 1995-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -80,11 +80,11 @@ static void drawCursorExt(int pos, int color, int graphic) graphic = cursor_array[pos]; if (color == FC_RED) - graphic = (graphic == GFX_ARROW_BLUE_LEFT ? GFX_ARROW_RED_LEFT : - graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT : - GFX_KUGEL_ROT); + graphic = (graphic == IMG_ARROW_BLUE_LEFT ? IMG_ARROW_RED_LEFT : + graphic == IMG_ARROW_BLUE_RIGHT ? IMG_ARROW_RED_RIGHT : + IMG_BALL_RED); - DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic); + DrawNewGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic, 0); } static void initCursor(int pos, int graphic) @@ -155,7 +155,7 @@ void DrawMainMenu() /* needed if last screen was the setup screen and fullscreen state changed */ ToggleFullscreenIfNeeded(); - /* needed if last screen (setup/level) changed graphics, sounds or music */ + /* needed if last screen (level choice) changed graphics, sounds or music */ ReloadCustomArtwork(); #ifdef TARGET_SDL @@ -206,10 +206,10 @@ void DrawMainMenu() } for(i=0; i<8; i++) - initCursor(i, (i == 1 || i == 6 ? GFX_ARROW_BLUE_RIGHT : GFX_KUGEL_BLAU)); + initCursor(i, (i == 1 || i == 6 ? IMG_ARROW_BLUE_RIGHT : IMG_BALL_BLUE)); - DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT); - DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT); + DrawNewGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0); + DrawNewGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0); DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FS_SMALL, FC_RED); @@ -674,7 +674,7 @@ void DrawHelpScreenElAction(int start) } j++; - DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame); + DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame); i++; } @@ -837,8 +837,8 @@ void HandleHelpScreen(int button) for(i=0;i 0) { xpos--; setup.player_name[xpos] = 0; - DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT); - DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM); + DrawNewGraphic(xpos + 6, ypos, IMG_BALL_RED, 0); + DrawNewGraphic(xpos + 7, ypos, IMG_EMPTY, 0); } else if (key == KSYM_Return && xpos > 0) { DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_RED); - DrawGraphic(xpos + 6, ypos, GFX_LEERRAUM); + DrawNewGraphic(xpos + 6, ypos, IMG_EMPTY, 0); SaveSetup(); game_status = MAINMENU; @@ -995,18 +1001,18 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color); if (node->parent_link) - initCursor(i, GFX_ARROW_BLUE_LEFT); + initCursor(i, IMG_ARROW_BLUE_LEFT); else if (node->level_group) - initCursor(i, GFX_ARROW_BLUE_RIGHT); + initCursor(i, IMG_ARROW_BLUE_RIGHT); else - initCursor(i, GFX_KUGEL_BLAU); + initCursor(i, IMG_BALL_BLUE); } if (first_entry > 0) - DrawGraphic(0, 1, GFX_ARROW_BLUE_UP); + DrawNewGraphic(0, 1, IMG_ARROW_BLUE_UP, 0); if (first_entry + num_page_entries < num_entries) - DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN); + DrawNewGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, IMG_ARROW_BLUE_DOWN, 0); } static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) @@ -1356,6 +1362,10 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) static struct TokenInfo *setup_info; static int num_setup_info; +static char *graphics_set_name; +static char *sounds_set_name; +static char *music_set_name; + static void execSetupMain() { setup_mode = SETUP_MODE_MAIN; @@ -1370,23 +1380,30 @@ static void execSetupGame() static void execSetupGraphics() { - setup.graphics_set = artwork.gfx_current->name; - setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); } static void execSetupSound() { - setup.sounds_set = artwork.snd_current->name; - setup.music_set = artwork.mus_current->name; - setup_mode = SETUP_MODE_SOUND; DrawSetupScreen(); } static void execSetupArtwork() { + /* needed if last screen (setup choice) changed graphics, sounds or music */ + ReloadCustomArtwork(); + + setup.graphics_set = artwork.gfx_current->identifier; + setup.sounds_set = artwork.snd_current->identifier; + setup.music_set = artwork.mus_current->identifier; + + /* needed for displaying artwork name instead of artwork identifier */ + graphics_set_name = artwork.gfx_current->name; + sounds_set_name = artwork.snd_current->name; + music_set_name = artwork.mus_current->name; + setup_mode = SETUP_MODE_ARTWORK; DrawSetupScreen(); } @@ -1489,11 +1506,11 @@ static struct TokenInfo setup_info_sound[] = static struct TokenInfo setup_info_artwork[] = { { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" }, - { TYPE_STRING, &setup.graphics_set, "" }, + { TYPE_STRING, &graphics_set_name, "" }, { TYPE_ENTER_MENU, execSetupChooseSounds, "Custom Sounds" }, - { TYPE_STRING, &setup.sounds_set, "" }, + { TYPE_STRING, &sounds_set_name, "" }, { TYPE_ENTER_MENU, execSetupChooseMusic, "Custom Music" }, - { TYPE_STRING, &setup.music_set, "" }, + { TYPE_STRING, &music_set_name, "" }, { TYPE_EMPTY, NULL, "" }, { TYPE_STRING, NULL, "Override Level Artwork:"}, { TYPE_YES_NO, &setup.override_level_graphics, "Graphics:" }, @@ -1661,7 +1678,7 @@ static void DrawSetupScreen_Generic() else if (setup_mode == SETUP_MODE_ARTWORK) { setup_info = setup_info_artwork; - title_string = "Setup Sound"; + title_string = "Custom Artwork"; } else if (setup_mode == SETUP_MODE_SHORTCUT) { @@ -1691,11 +1708,11 @@ static void DrawSetupScreen_Generic() DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN); if (setup_info[i].type & TYPE_ENTER_MENU) - initCursor(i, GFX_ARROW_BLUE_RIGHT); + initCursor(i, IMG_ARROW_BLUE_RIGHT); else if (setup_info[i].type & TYPE_LEAVE_MENU) - initCursor(i, GFX_ARROW_BLUE_LEFT); + initCursor(i, IMG_ARROW_BLUE_LEFT); else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) - initCursor(i, GFX_KUGEL_BLAU); + initCursor(i, IMG_BALL_BLUE); if (setup_info[i].type & TYPE_VALUE) drawSetupValue(i); @@ -1803,13 +1820,13 @@ void DrawSetupScreen_Input() ClearWindow(); DrawText(SX+16, SY+16, "Setup Input", FS_BIG, FC_YELLOW); - initCursor(0, GFX_KUGEL_BLAU); - initCursor(1, GFX_KUGEL_BLAU); - initCursor(2, GFX_ARROW_BLUE_RIGHT); - initCursor(13, GFX_ARROW_BLUE_LEFT); + initCursor(0, IMG_BALL_BLUE); + initCursor(1, IMG_BALL_BLUE); + initCursor(2, IMG_ARROW_BLUE_RIGHT); + initCursor(13, IMG_ARROW_BLUE_LEFT); - DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT); - DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_RIGHT); + DrawNewGraphic(10, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_LEFT, 0); + DrawNewGraphic(12, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_RIGHT, 0); DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN); DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN); @@ -1875,7 +1892,7 @@ static void drawPlayerSetupInputInfo(int 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); + DrawNewGraphic(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0); if (setup.input[player_nr].use_joystick) { @@ -1893,10 +1910,10 @@ static void drawPlayerSetupInputInfo(int player_nr) } DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN); - DrawGraphic(1, 6, GFX_ARROW_BLUE_LEFT); - DrawGraphic(1, 7, GFX_ARROW_BLUE_RIGHT); - DrawGraphic(1, 8, GFX_ARROW_BLUE_UP); - DrawGraphic(1, 9, GFX_ARROW_BLUE_DOWN); + DrawNewGraphic(1, 6, IMG_ARROW_BLUE_LEFT, 0); + DrawNewGraphic(1, 7, IMG_ARROW_BLUE_RIGHT, 0); + DrawNewGraphic(1, 8, IMG_ARROW_BLUE_UP, 0); + DrawNewGraphic(1, 9, IMG_ARROW_BLUE_DOWN, 0); 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); @@ -2089,7 +2106,7 @@ void CustomizeKeyboard(int player_nr) { case EVENT_KEYPRESS: { - Key key = GetEventKey((KeyEvent *)&event, TRUE); + Key key = GetEventKey((KeyEvent *)&event, FALSE); if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { @@ -2198,7 +2215,7 @@ static boolean CalibrateJoystickMain(int player_nr) for(x=0; x<3; x++) { check[x][y] = FALSE; - DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU); + DrawNewGraphic(xpos + x - 1, ypos + y - 1, IMG_BALL_BLUE, 0); } } @@ -2221,7 +2238,7 @@ static boolean CalibrateJoystickMain(int player_nr) new_joystick_xmiddle = joy_x; new_joystick_ymiddle = joy_y; - DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT); + DrawNewGraphic(xpos + last_x, ypos + last_y, IMG_BALL_RED, 0); BackToFront(); while(Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ @@ -2291,8 +2308,8 @@ static boolean CalibrateJoystickMain(int player_nr) if (x != last_x || y != last_y) { - DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_GELB); - DrawGraphic(xpos + x, ypos + y, GFX_KUGEL_ROT); + DrawNewGraphic(xpos + last_x, ypos + last_y, IMG_BALL_YELLOW, 0); + DrawNewGraphic(xpos + x, ypos + y, IMG_BALL_RED, 0); last_x = x; last_y = y;