/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2001 Artsoft Entertainment *
+* (c) 1995-2002 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/* screens in the setup menu */
#define SETUP_MODE_MAIN 0
-#define SETUP_MODE_INPUT 1
-#define SETUP_MODE_SHORTCUT 2
-#define SETUP_MODE_GRAPHICS 3
-#define SETUP_MODE_SOUND 4
-#define SETUP_MODE_CHOOSE_GRAPHICS 5
-#define SETUP_MODE_CHOOSE_SOUNDS 6
-#define SETUP_MODE_CHOOSE_MUSIC 7
-
-#define MAX_SETUP_MODES 8
+#define SETUP_MODE_GAME 1
+#define SETUP_MODE_INPUT 2
+#define SETUP_MODE_SHORTCUT 3
+#define SETUP_MODE_GRAPHICS 4
+#define SETUP_MODE_SOUND 5
+#define SETUP_MODE_ARTWORK 6
+#define SETUP_MODE_CHOOSE_GRAPHICS 7
+#define SETUP_MODE_CHOOSE_SOUNDS 8
+#define SETUP_MODE_CHOOSE_MUSIC 9
+
+#define MAX_SETUP_MODES 10
/* for input setup functions */
#define SETUPINPUT_SCREEN_POS_START 0
/* forward declarations of internal functions */
static void HandleScreenGadgets(struct GadgetInfo *);
-static void execExitSetupChooseArtwork(void);
static void HandleSetupScreen_Generic(int, int, int, int, int);
static void HandleSetupScreen_Input(int, int, int, int, int);
static void CustomizeKeyboard(int);
static void CalibrateJoystick(int);
+static void execSetupArtwork(void);
static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
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);
+ DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic, 0);
}
static void initCursor(int pos, int graphic)
if (setup.fullscreen != video.fullscreen_enabled)
{
/* save old door content */
- BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+ BlitBitmap(backbuffer, bitmap_db_door,
DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
/* toggle fullscreen */
setup.fullscreen = video.fullscreen_enabled;
/* redraw background to newly created backbuffer */
- BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
+ BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, backbuffer,
+ 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);
/* restore old door content */
- BlitBitmap(pix[PIX_DB_DOOR], backbuffer,
+ BlitBitmap(bitmap_db_door, backbuffer,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
redraw_mask = REDRAW_ALL;
UnmapAllGadgets();
FadeSounds();
KeyboardAutoRepeatOn();
- ActivateJoystickIfAvailable();
+ ActivateJoystick();
SetDrawDeactivationMask(REDRAW_NONE);
+ audio.sound_deactivated = FALSE;
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
/* 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
}
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);
+ DrawGraphic(10, 3, IMG_ARROW_BLUE_LEFT, 0);
+ DrawGraphic(14, 3, IMG_ARROW_BLUE_RIGHT, 0);
DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
FS_SMALL, FC_RED);
#if 0
ClearEventQueue();
#endif
-
}
static void gotoTopLevelDir()
}
j++;
- DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
+ DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
i++;
}
FadeToFront();
InitAnimation();
- PlaySoundLoop(SND_RHYTHMLOOP);
+ PlaySoundLoop(SND_MENU_INFO_SCREEN);
}
void HandleHelpScreen(int button)
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
helpscreen_state++;
- DrawHelpScreenElText(helpscreen_state*MAX_HELPSCREEN_ELS);
- DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+ DrawHelpScreenElText(helpscreen_state * MAX_HELPSCREEN_ELS);
+ DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
}
else if (helpscreen_state <
num_helpscreen_els_pages + num_helpscreen_music - 1)
}
else
{
- if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
+ if (DelayReached(&hs_delay, GAME_FRAME_DELAY * 2))
{
- if (helpscreen_state<num_helpscreen_els_pages)
- DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+ if (helpscreen_state < num_helpscreen_els_pages)
+ DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
}
+
+ /* !!! workaround for playing "music" that is really a sound loop (and
+ must therefore periodically be reactivated with the current sound
+ engine !!! */
+ PlaySoundLoop(SND_MENU_INFO_SCREEN);
+
DoAnimation();
}
{
xpos = newxpos;
DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW);
- DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+ DrawGraphic(xpos + 6, ypos, IMG_BALL_RED, 0);
return;
}
setup.player_name, FS_BIG, FC_YELLOW);
DrawTextExt(window, SX + 6*32, SY + ypos*32,
setup.player_name, FS_BIG, FC_YELLOW);
- DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+ DrawGraphic(xpos + 6, ypos, IMG_BALL_RED, 0);
}
else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
{
xpos--;
setup.player_name[xpos] = 0;
- DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
- DrawGraphic(xpos + 7, ypos, GFX_LEERRAUM);
+ DrawGraphic(xpos + 6, ypos, IMG_BALL_RED, 0);
+ DrawGraphic(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);
+ DrawGraphic(xpos + 6, ypos, IMG_EMPTY, 0);
SaveSetup();
game_status = MAINMENU;
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);
+ DrawGraphic(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);
+ DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, IMG_ARROW_BLUE_DOWN, 0);
}
static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
}
else if (game_status == SETUP)
{
- execExitSetupChooseArtwork();
+ execSetupArtwork();
}
else
{
if (game_status == SETUP)
{
- execExitSetupChooseArtwork();
+ execSetupArtwork();
}
else
{
FadeToFront();
InitAnimation();
HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
- PlaySound(SND_HALLOFFAME);
+ PlaySound(SND_MENU_HALL_OF_FAME);
}
static void drawHallOfFameList(int first_entry, int highlight_position)
if (button_released)
{
- FadeSound(SND_HALLOFFAME);
+ FadeSound(SND_MENU_HALL_OF_FAME);
game_status = MAINMENU;
DrawMainMenu();
}
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;
DrawSetupScreen();
}
-static void execSetupGraphics()
+static void execSetupGame()
{
- setup.graphics_set = artwork.gfx_current->name;
+ setup_mode = SETUP_MODE_GAME;
+ DrawSetupScreen();
+}
+static void execSetupGraphics()
+{
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();
+}
+
static void execSetupChooseGraphics()
{
setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
DrawSetupScreen();
}
-static void execExitSetupChooseArtwork()
-{
- if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
- execSetupGraphics();
- else
- execSetupSound();
-}
-
static void execExitSetup()
{
game_status = MAINMENU;
static struct TokenInfo setup_info_main[] =
{
- { TYPE_ENTER_MENU, execSetupGraphics, "Graphics Setup" },
- { TYPE_ENTER_MENU, execSetupSound, "Sound Setup" },
+ { TYPE_ENTER_MENU, execSetupGame, "Game Settings" },
+ { TYPE_ENTER_MENU, execSetupGraphics, "Graphics" },
+ { TYPE_ENTER_MENU, execSetupSound, "Sound & Music" },
+ { TYPE_ENTER_MENU, execSetupArtwork, "Custom Artwork" },
{ TYPE_ENTER_MENU, execSetupInput, "Input Devices" },
{ TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" },
{ TYPE_EMPTY, NULL, "" },
-#if 0
- { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" },
- { TYPE_SWITCH, &setup.fading, "Fading:" },
-#endif
- { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" },
- { TYPE_SWITCH, &setup.ask_on_escape, "Ask on Esc:" },
- { TYPE_SWITCH, &setup.toons, "Toons:" },
- { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" },
+ { TYPE_LEAVE_MENU, execExitSetup, "Exit" },
+ { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" },
+ { 0, NULL, NULL }
+};
+
+static struct TokenInfo setup_info_game[] =
+{
{ TYPE_SWITCH, &setup.team_mode, "Team-Mode:" },
{ TYPE_SWITCH, &setup.handicap, "Handicap:" },
{ TYPE_SWITCH, &setup.time_limit, "Timelimit:" },
+ { TYPE_SWITCH, &setup.autorecord, "Auto-Record:" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execExitSetup, "Exit" },
- { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
{ 0, NULL, NULL }
};
static struct TokenInfo setup_info_graphics[] =
{
- { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" },
- { TYPE_STRING, &setup.graphics_set, "" },
- { TYPE_EMPTY, NULL, "" },
{ TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" },
{ TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" },
{ TYPE_SWITCH, &setup.soft_scrolling, "Soft Scroll.:" },
+#if 0
+ { TYPE_SWITCH, &setup.double_buffering,"Buffered gfx:" },
+ { TYPE_SWITCH, &setup.fading, "Fading:" },
+#endif
+ { TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" },
+ { TYPE_SWITCH, &setup.toons, "Toons:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Exit" },
{ 0, NULL, NULL }
{ TYPE_SWITCH, &setup.sound_loops, "Sound Loops:" },
{ TYPE_SWITCH, &setup.sound_music, "Game Music:" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { 0, NULL, NULL }
+};
+
+static struct TokenInfo setup_info_artwork[] =
+{
+ { TYPE_ENTER_MENU, execSetupChooseGraphics,"Custom Graphics" },
+ { 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:" },
+ { TYPE_YES_NO, &setup.override_level_sounds, "Sounds:" },
+ { TYPE_YES_NO, &setup.override_level_music, "Music:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Exit" },
{ 0, NULL, NULL }
{ TYPE_KEY, &setup.shortcut.save_game, "" },
{ TYPE_KEYTEXT, NULL, "Quick Load Game:", },
{ TYPE_KEY, &setup.shortcut.load_game, "" },
+ { TYPE_KEYTEXT, NULL, "Toggle Pause:", },
+ { TYPE_KEY, &setup.shortcut.toggle_pause, "" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_YES_NO, &setup.ask_on_escape, "Ask on Esc:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Exit" },
{ 0, NULL, NULL }
char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
setup_info[pos].value);
+ if (value_string == NULL)
+ return;
+
if (setup_info[pos].type & TYPE_KEY)
{
xpos = 3;
setup_info = setup_info_main;
title_string = "Setup";
}
+ else if (setup_mode == SETUP_MODE_GAME)
+ {
+ setup_info = setup_info_game;
+ title_string = "Setup Game";
+ }
else if (setup_mode == SETUP_MODE_GRAPHICS)
{
setup_info = setup_info_graphics;
setup_info = setup_info_sound;
title_string = "Setup Sound";
}
+ else if (setup_mode == SETUP_MODE_ARTWORK)
+ {
+ setup_info = setup_info_artwork;
+ title_string = "Custom Artwork";
+ }
else if (setup_mode == SETUP_MODE_SHORTCUT)
{
setup_info = setup_info_shortcut;
if ((value_ptr == &setup.sound && !audio.sound_available) ||
(value_ptr == &setup.sound_loops && !audio.loops_available) ||
(value_ptr == &setup.sound_music && !audio.music_available) ||
- (value_ptr == &setup.sound_music && !audio.music_available) ||
(value_ptr == &setup.fullscreen && !video.fullscreen_available))
setup_info[i].type |= TYPE_GHOSTED;
- if (setup_info[i].type & TYPE_ENTER_OR_LEAVE_MENU)
- font_size = FS_BIG;
+ if (setup_info[i].type & TYPE_STRING)
+ font_size = FS_MEDIUM;
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);
}
else if (!(setup_info[y].type & TYPE_GHOSTED))
{
-#if 0
- if (setup_info[y].type & TYPE_BOOLEAN_STYLE)
- {
- boolean new_value = !*(boolean *)(setup_info[y].value);
-
- *(boolean *)setup_info[y].value = new_value;
- drawSetupValue(y);
- }
- else if (setup_info[y].type == TYPE_KEYTEXT &&
- setup_info[y + 1].type == TYPE_KEY)
- {
- changeSetupValue(y + 1);
- }
- else if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
- {
- void (*menu_callback_function)(void) = setup_info[choice].value;
-
- menu_callback_function();
- }
-#else
if (setup_info[y].type & TYPE_ENTER_OR_LEAVE_MENU)
{
void (*menu_callback_function)(void) = setup_info[choice].value;
if (setup_info[y].type & TYPE_VALUE)
changeSetupValue(y);
}
-#endif
}
}
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);
+ DrawGraphic(10, MENU_SCREEN_START_YPOS, IMG_ARROW_BLUE_LEFT, 0);
+ DrawGraphic(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);
DrawText(SX+32, SY+15*32, "Exit", FS_BIG, FC_GREEN);
+#if 0
DeactivateJoystickForCalibration();
DrawTextFCentered(SYSIZE - 20, FC_BLUE,
"Joysticks deactivated on this screen");
+#endif
HandleSetupScreen_Input(0,0, 0,0, MB_MENU_INITIALIZE);
FadeToFront();
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);
+ DrawGraphic(8, 2, PLAYER_NR_GFX(IMG_PLAYER1, player_nr), 0);
if (setup.input[player_nr].use_joystick)
{
}
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);
+ DrawGraphic(1, 6, IMG_ARROW_BLUE_LEFT, 0);
+ DrawGraphic(1, 7, IMG_ARROW_BLUE_RIGHT, 0);
+ DrawGraphic(1, 8, IMG_ARROW_BLUE_UP, 0);
+ DrawGraphic(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);
{
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))
{
for(x=0; x<3; x++)
{
check[x][y] = FALSE;
- DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU);
+ DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_BALL_BLUE, 0);
}
}
new_joystick_xmiddle = joy_x;
new_joystick_ymiddle = joy_y;
- DrawGraphic(xpos + last_x, ypos + last_y, GFX_KUGEL_ROT);
+ DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_RED, 0);
BackToFront();
while(Joystick(player_nr) & JOY_BUTTON); /* wait for released button */
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);
+ DrawGraphic(xpos + last_x, ypos + last_y, IMG_BALL_YELLOW, 0);
+ DrawGraphic(xpos + x, ypos + y, IMG_BALL_RED, 0);
last_x = x;
last_y = y;
void DrawSetupScreen()
{
+ DeactivateJoystick();
+
if (setup_mode == SETUP_MODE_INPUT)
DrawSetupScreen_Input();
else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS)
/* ---------- new screen button stuff -------------------------------------- */
/* graphic position and size values for buttons and scrollbars */
-#define SC_SCROLLBUTTON_XPOS 64
-#define SC_SCROLLBUTTON_YPOS 0
-#define SC_SCROLLBAR_XPOS 0
-#define SC_SCROLLBAR_YPOS 64
-
#define SC_SCROLLBUTTON_XSIZE 32
#define SC_SCROLLBUTTON_YSIZE 32
static struct
{
- int xpos, ypos;
+ int gfx_unpressed, gfx_pressed;
int x, y;
int gadget_id;
char *infotext;
} scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] =
{
{
- SC_SCROLLBUTTON_XPOS + 0 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS,
- SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS,
+ IMG_ARROW_BLUE_UP, IMG_ARROW_RED_UP,
+ SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS,
SCREEN_CTRL_ID_SCROLL_UP,
- "scroll level series up"
+ "scroll up"
},
{
- SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS,
- SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
+ IMG_ARROW_BLUE_DOWN, IMG_ARROW_RED_DOWN,
+ SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
SCREEN_CTRL_ID_SCROLL_DOWN,
- "scroll level series down"
+ "scroll down"
}
};
static struct
{
- int xpos, ypos;
+ int gfx_unpressed, gfx_pressed;
int x, y;
int width, height;
int type;
} scrollbar_info[NUM_SCREEN_SCROLLBARS] =
{
{
- SC_SCROLLBAR_XPOS, SC_SCROLLBAR_YPOS,
- SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS,
- SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE,
+ IMG_SCROLLBAR_BLUE, IMG_SCROLLBAR_RED,
+ SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS,
+ SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE,
GD_TYPE_SCROLLBAR_VERTICAL,
SCREEN_CTRL_ID_SCROLL_VERTICAL,
"scroll level series vertically"
static void CreateScreenScrollbuttons()
{
- Bitmap *gd_bitmap = pix[PIX_MORE];
struct GadgetInfo *gi;
unsigned long event_mask;
int i;
for (i=0; i<NUM_SCREEN_SCROLLBUTTONS; i++)
{
- int id = scrollbutton_info[i].gadget_id;
+ Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+ int gfx_unpressed, gfx_pressed;
int x, y, width, height;
int gd_x1, gd_x2, gd_y1, gd_y2;
+ int id = scrollbutton_info[i].gadget_id;
x = scrollbutton_info[i].x;
y = scrollbutton_info[i].y;
y += SY;
width = SC_SCROLLBUTTON_XSIZE;
height = SC_SCROLLBUTTON_YSIZE;
- gd_x1 = scrollbutton_info[i].xpos;
- gd_y1 = scrollbutton_info[i].ypos;
- gd_x2 = gd_x1;
- gd_y2 = gd_y1 + SC_SCROLLBUTTON_YSIZE;
+
+ gfx_unpressed = scrollbutton_info[i].gfx_unpressed;
+ gfx_pressed = scrollbutton_info[i].gfx_pressed;
+ gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap;
+ gd_bitmap_pressed = new_graphic_info[gfx_pressed].bitmap;
+ gd_x1 = new_graphic_info[gfx_unpressed].src_x;
+ gd_y1 = new_graphic_info[gfx_unpressed].src_y;
+ gd_x2 = new_graphic_info[gfx_pressed].src_x;
+ gd_y2 = new_graphic_info[gfx_pressed].src_y;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
GDI_HEIGHT, height,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_STATE, GD_BUTTON_UNPRESSED,
- GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
- GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
+ GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleScreenGadgets,
GDI_END);
for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
{
- int id = scrollbar_info[i].gadget_id;
- Bitmap *gd_bitmap = pix[PIX_MORE];
+ Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+ int gfx_unpressed, gfx_pressed;
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
unsigned long event_mask;
int num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
+ int id = scrollbar_info[i].gadget_id;
-#if 0
- if (num_leveldirs <= MAX_MENU_ENTRIES_ON_SCREEN)
- num_page_entries = num_leveldirs;
- else
- num_page_entries = MAX_MENU_ENTRIES_ON_SCREEN - 1;
-
- items_max = MAX(num_leveldirs, num_page_entries);
- items_visible = num_page_entries;
- item_position = 0;
-#else
items_max = num_page_entries;
items_visible = num_page_entries;
item_position = 0;
-#endif
event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
- gd_x1 = scrollbar_info[i].xpos;
- gd_x2 = gd_x1 + scrollbar_info[i].width;
- gd_y1 = scrollbar_info[i].ypos;
- gd_y2 = scrollbar_info[i].ypos;
+ gfx_unpressed = scrollbar_info[i].gfx_unpressed;
+ gfx_pressed = scrollbar_info[i].gfx_pressed;
+ gd_bitmap_unpressed = new_graphic_info[gfx_unpressed].bitmap;
+ gd_bitmap_pressed = new_graphic_info[gfx_pressed].bitmap;
+ gd_x1 = new_graphic_info[gfx_unpressed].src_x;
+ gd_y1 = new_graphic_info[gfx_unpressed].src_y;
+ gd_x2 = new_graphic_info[gfx_pressed].src_x;
+ gd_y2 = new_graphic_info[gfx_pressed].src_y;
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
GDI_SCROLLBAR_ITEM_POSITION, item_position,
GDI_STATE, GD_BUTTON_UNPRESSED,
- GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
- GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
+ GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
GDI_BORDER_SIZE, SC_BORDER_SIZE,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleScreenGadgets,
{
int id = gi->custom_id;
- if (game_status != CHOOSELEVEL)
+ if (game_status != CHOOSELEVEL && game_status != SETUP)
return;
switch (id)
{
case SCREEN_CTRL_ID_SCROLL_UP:
- HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK);
+ if (game_status == CHOOSELEVEL)
+ HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK);
+ else if (game_status == SETUP)
+ HandleSetupScreen(SX,SY + 32, 0,0, MB_MENU_MARK);
break;
case SCREEN_CTRL_ID_SCROLL_DOWN:
- HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+ if (game_status == CHOOSELEVEL)
+ HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
+ else if (game_status == SETUP)
+ HandleSetupScreen(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
break;
case SCREEN_CTRL_ID_SCROLL_VERTICAL:
- HandleChooseLevel(0,0, 999,gi->event.item_position, MB_MENU_INITIALIZE);
+ if (game_status == CHOOSELEVEL)
+ HandleChooseLevel(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+ else if (game_status == SETUP)
+ HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
break;
default: