/***********************************************************
* 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_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
+#define SETUP_MODE_EDITOR 2
+#define SETUP_MODE_INPUT 3
+#define SETUP_MODE_SHORTCUT 4
+#define SETUP_MODE_GRAPHICS 5
+#define SETUP_MODE_SOUND 6
+#define SETUP_MODE_ARTWORK 7
+#define SETUP_MODE_CHOOSE_GRAPHICS 8
+#define SETUP_MODE_CHOOSE_SOUNDS 9
+#define SETUP_MODE_CHOOSE_MUSIC 10
+
+#define MAX_SETUP_MODES 11
/* for input setup functions */
#define SETUPINPUT_SCREEN_POS_START 0
static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
static int setup_mode = SETUP_MODE_MAIN;
-static void drawCursorExt(int pos, int color, int graphic)
+#if 0
+static int mSX = SX;
+static int mSY = SY;
+#else
+#define mSX (SX + (game_status == MAINMENU ? global.menu_draw_xoffset_MAIN : \
+ global.menu_draw_xoffset))
+#define mSY (SY + (game_status == MAINMENU ? global.menu_draw_yoffset_MAIN : \
+ global.menu_draw_yoffset))
+#endif
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+#define NUM_SCROLLBAR_BITMAPS 2
+static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS];
+#endif
+
+
+static void drawCursorExt(int xpos, int ypos, int color, int graphic)
{
static int cursor_array[SCR_FIELDY];
- if (graphic)
- cursor_array[pos] = graphic;
-
- graphic = cursor_array[pos];
+ if (xpos == 0)
+ {
+ if (graphic != 0)
+ cursor_array[ypos] = graphic;
+ else
+ graphic = cursor_array[ypos];
+ }
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_MENU_BUTTON_LEFT ? IMG_MENU_BUTTON_LEFT_ACTIVE :
+ graphic == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE:
+ IMG_MENU_BUTTON_ACTIVE);
+
+ ypos += MENU_SCREEN_START_YPOS;
+
+#if 1
+ DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY);
+ DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY,
+ graphic, 0);
+#else
+ DrawBackground(SX + xpos * 32, SY + ypos * 32, TILEX, TILEY);
+ DrawGraphicThruMask(xpos, ypos, graphic, 0);
+#endif
+}
+
+static void initCursor(int ypos, int graphic)
+{
+ drawCursorExt(0, ypos, FC_BLUE, graphic);
+}
- DrawGraphic(0, MENU_SCREEN_START_YPOS + pos, graphic);
+static void drawCursor(int ypos, int color)
+{
+ drawCursorExt(0, ypos, color, 0);
+}
+
+static void drawCursorXY(int xpos, int ypos, int graphic)
+{
+ drawCursorExt(xpos, ypos, -1, graphic);
}
-static void initCursor(int pos, int graphic)
+static void PlaySound_Menu_Start(int sound)
{
- drawCursorExt(pos, FC_BLUE, graphic);
+ if (sound_info[sound].loop)
+ PlaySoundLoop(sound);
+ else
+ PlaySound(sound);
}
-static void drawCursor(int pos, int color)
+static void PlaySound_Menu_Continue(int sound)
{
- drawCursorExt(pos, color, 0);
+ if (sound_info[sound].loop)
+ PlaySoundLoop(sound);
}
void DrawHeadline()
{
- int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
+ int font1_width = getFontWidth(FONT_TITLE_1);
+ int font2_width = getFontWidth(FONT_TITLE_2);
+ int x1 = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * font1_width) / 2;
+ int x2 = SX + (SXSIZE - strlen(WINDOW_SUBTITLE_STRING) * font2_width) / 2;
- DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
- DrawTextFCentered(46, FC_RED, WINDOW_SUBTITLE_STRING);
+ DrawText(x1, SY + 8, PROGRAM_TITLE_STRING, FONT_TITLE_1);
+ DrawText(x2, SY + 46, WINDOW_SUBTITLE_STRING, FONT_TITLE_2);
}
static void ToggleFullscreenIfNeeded()
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(graphic_info[IMG_GLOBAL_BORDER].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;
void DrawMainMenu()
{
static LevelDirTree *leveldir_last_valid = NULL;
- int i;
char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
+ int font_width = getFontWidth(FONT_MENU_1);
+ int name_width = font_width * strlen("Name:");
+ int level_width = font_width * strlen("Level:");
+ int i;
+
+#if 0
+ mSX = SX + global.menu_draw_xoffset;
+ mSY = SY + global.menu_draw_yoffset;
+#endif
UnmapAllGadgets();
FadeSounds();
+
KeyboardAutoRepeatOn();
ActivateJoystick();
+ SetMouseCursor(CURSOR_DEFAULT);
+
SetDrawDeactivationMask(REDRAW_NONE);
+ SetDrawBackgroundMask(REDRAW_FIELD);
+
audio.sound_deactivated = FALSE;
/* needed if last screen was the playing screen, invoked from level editor */
GetPlayerConfig();
LoadLevel(level_nr);
+ SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
ClearWindow();
+
DrawHeadline();
- DrawText(SX + 32, SY + 2*32, name_text, FS_BIG, FC_GREEN);
- DrawText(SX + 6*32, SY + 2*32, setup.player_name, FS_BIG, FC_RED);
- DrawText(SX + 32, SY + 3*32, "Level:", FS_BIG, FC_GREEN);
- DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG,
- (leveldir_current->readonly ? FC_RED : FC_YELLOW));
- DrawText(SX + 32, SY + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN);
- DrawText(SX + 32, SY + 5*32, "Level Creator", FS_BIG, FC_GREEN);
- DrawText(SY + 32, SY + 6*32, "Info Screen", FS_BIG, FC_GREEN);
- DrawText(SX + 32, SY + 7*32, "Start Game", FS_BIG, FC_GREEN);
- DrawText(SX + 32, SY + 8*32, "Setup", FS_BIG, FC_GREEN);
- DrawText(SX + 32, SY + 9*32, "Quit", FS_BIG, FC_GREEN);
+
+ DrawText(mSX + 32, mSY + 2*32, name_text, FONT_MENU_1);
+ DrawText(mSX + 32, mSY + 3*32, "Level:", FONT_MENU_1);
+ DrawText(mSX + 32, mSY + 4*32, "Hall Of Fame", FONT_MENU_1);
+ DrawText(mSX + 32, mSY + 5*32, "Level Creator", FONT_MENU_1);
+ DrawText(mSY + 32, mSY + 6*32, "Info Screen", FONT_MENU_1);
+ DrawText(mSX + 32, mSY + 7*32, "Start Game", FONT_MENU_1);
+ DrawText(mSX + 32, mSY + 8*32, "Setup", FONT_MENU_1);
+ DrawText(mSX + 32, mSY + 9*32, "Quit", FONT_MENU_1);
+
+ DrawText(mSX + 32 + name_width, mSY + 2*32, setup.player_name, FONT_INPUT);
+ DrawText(mSX + level_width + 5 * 32, mSY + 3*32, int2str(level_nr,3),
+ FONT_VALUE_1);
DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
- DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d",
- leveldir_current->first_level,
- leveldir_current->last_level);
+ DrawTextF(mSX + 32 + level_width - 2, mSY + 3*32 + 1, FONT_TEXT_3, "%d-%d",
+ leveldir_current->first_level, leveldir_current->last_level);
+ /*
if (leveldir_current->readonly)
+ */
{
- DrawTextF(15*32 + 6, 3*32 + 9 - 7, FC_RED, "READ");
- DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY");
+ DrawTextF(mSX + level_width + 9*32 - 2,
+ mSY + 3*32 + 1 - 7, FONT_TEXT_3, "READ");
+ DrawTextF(mSX + level_width + 9*32 - 2,
+ mSY + 3*32 + 1 + 7, FONT_TEXT_3, "ONLY");
}
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_MENU_BUTTON_RIGHT :IMG_MENU_BUTTON));
- DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT);
- DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT);
+ 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",
- FS_SMALL, FC_RED);
-
- if (leveldir_current->name)
- {
- int len = strlen(leveldir_current->name);
- int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2;
- int lypos = SY + 352;
-
- DrawText(lxpos, lypos, leveldir_current->name, FS_SMALL, FC_SPECIAL2);
- }
+ DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment", FONT_TITLE_2);
FadeToFront();
InitAnimation();
static unsigned long level_delay = 0;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int new_level_nr, old_level_nr = level_nr;
- int font_color = (leveldir_current->readonly ? FC_RED : FC_YELLOW);
new_level_nr = level_nr + (x == 10 ? -step : +step);
if (new_level_nr < leveldir_current->first_level)
level_nr = new_level_nr;
- DrawTextExt(drawto, SX + 11 * 32, SY + 3 * 32,
- int2str(level_nr, 3), FS_BIG, font_color);
- DrawTextExt(window, SX + 11 * 32, SY + 3 * 32,
- int2str(level_nr, 3), FS_BIG, font_color);
+ DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1);
LoadLevel(level_nr);
DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
static long helpscreen_state;
static int helpscreen_step[MAX_HELPSCREEN_ELS];
static int helpscreen_frame[MAX_HELPSCREEN_ELS];
-static int helpscreen_delay[MAX_HELPSCREEN_ELS];
-static int helpscreen_action[] =
+#if 0
+static int OLD_helpscreen_action[] =
{
GFX_SPIELER1_DOWN,4,2,
GFX_SPIELER1_UP,4,2,
GFX_SPEED_PILL,1,100, HA_NEXT,
HA_END
};
+#endif
+
+static int helpscreen_action[] =
+{
+ IMG_PLAYER_1_MOVING_DOWN, 16,
+ IMG_PLAYER_1_MOVING_UP, 16,
+ IMG_PLAYER_1_MOVING_LEFT, 16,
+ IMG_PLAYER_1_MOVING_RIGHT, 16,
+ IMG_PLAYER_1_PUSHING_LEFT, 16,
+ IMG_PLAYER_1_PUSHING_RIGHT, 16, HA_NEXT,
+
+ IMG_SAND, -1, HA_NEXT,
+
+ IMG_EMPTY_SPACE, -1, HA_NEXT,
+
+ IMG_QUICKSAND_EMPTY, -1, HA_NEXT,
+
+ IMG_STEELWALL, -1, HA_NEXT,
+
+ IMG_WALL, -1, HA_NEXT,
+
+ IMG_EXPANDABLE_WALL_GROWING_LEFT, 20,
+ IMG_WALL, 50,
+ IMG_EMPTY_SPACE, 20,
+ IMG_EXPANDABLE_WALL_GROWING_RIGHT, 20,
+ IMG_WALL, 50,
+ IMG_EMPTY_SPACE, 20,
+ IMG_EXPANDABLE_WALL_GROWING_UP, 20,
+ IMG_WALL, 50,
+ IMG_EMPTY_SPACE, 20,
+ IMG_EXPANDABLE_WALL_GROWING_DOWN, 20,
+ IMG_WALL, 50,
+ IMG_EMPTY_SPACE, 20, HA_NEXT,
+
+ IMG_INVISIBLE_WALL, -1, HA_NEXT,
+
+ IMG_WALL_CRUMBLED, -1, HA_NEXT,
+
+ IMG_INFO_FONT_EM_1, 160,
+ IMG_INFO_FONT_EM_2, 160,
+ IMG_INFO_FONT_EM_3, 160,
+ IMG_INFO_FONT_EM_4, 160,
+ IMG_INFO_FONT_EM_5, 40, HA_NEXT,
+
+ IMG_EMERALD, -1, HA_NEXT,
+
+ IMG_DIAMOND, -1, HA_NEXT,
+
+ IMG_BD_DIAMOND, -1, HA_NEXT,
+
+ IMG_EMERALD_YELLOW, 50,
+ IMG_EMERALD_RED, 50,
+ IMG_EMERALD_PURPLE, 50, HA_NEXT,
+
+ IMG_BD_ROCK, -1, HA_NEXT,
+
+ IMG_BOMB, 100,
+ IMG_EXPLOSION, 16,
+ IMG_EMPTY_SPACE, 10, HA_NEXT,
+
+ IMG_NUT, 100,
+ IMG_NUT_BREAKING, 6,
+ IMG_EMERALD, 20, HA_NEXT,
+
+ IMG_WALL_EMERALD, 100,
+ IMG_EXPLOSION, 16,
+ IMG_EMERALD, 20, HA_NEXT,
+
+ IMG_WALL_DIAMOND, 100,
+ IMG_EXPLOSION, 16,
+ IMG_DIAMOND, 20, HA_NEXT,
+
+ IMG_WALL_BD_DIAMOND, 100,
+ IMG_EXPLOSION, 16,
+ IMG_BD_DIAMOND, 20, HA_NEXT,
+
+ IMG_WALL_EMERALD_YELLOW, 100,
+ IMG_EXPLOSION, 16,
+ IMG_EMERALD_YELLOW, 20,
+ IMG_WALL_EMERALD_RED, 100,
+ IMG_EXPLOSION, 16,
+ IMG_EMERALD_RED, 20,
+ IMG_WALL_EMERALD_PURPLE, 100,
+ IMG_EXPLOSION, 16,
+ IMG_EMERALD_PURPLE, 20, HA_NEXT,
+
+ IMG_ACID, -1, HA_NEXT,
+
+ IMG_KEY_1, 50,
+ IMG_KEY_2, 50,
+ IMG_KEY_3, 50,
+ IMG_KEY_4, 50, HA_NEXT,
+
+ IMG_GATE_1, 50,
+ IMG_GATE_2, 50,
+ IMG_GATE_3, 50,
+ IMG_GATE_4, 50, HA_NEXT,
+
+ IMG_GATE_1_GRAY, 50,
+ IMG_GATE_2_GRAY, 50,
+ IMG_GATE_3_GRAY, 50,
+ IMG_GATE_4_GRAY, 50, HA_NEXT,
+
+ IMG_DYNAMITE, -1, HA_NEXT,
+
+ IMG_DYNAMITE_ACTIVE, 96,
+ IMG_EXPLOSION, 16,
+ IMG_EMPTY_SPACE, 20, HA_NEXT,
+
+ IMG_DYNABOMB_ACTIVE, 100,
+ IMG_EXPLOSION, 16,
+ IMG_EMPTY_SPACE, 20, HA_NEXT,
+
+ EL_DYNABOMB_INCREASE_NUMBER, -1, HA_NEXT,
+
+ EL_DYNABOMB_INCREASE_SIZE, -1, HA_NEXT,
+
+ IMG_SPACESHIP_RIGHT, 16,
+ IMG_SPACESHIP_UP, 16,
+ IMG_SPACESHIP_LEFT, 16,
+ IMG_SPACESHIP_DOWN, 16, HA_NEXT,
+
+ IMG_BUG_RIGHT, 16,
+ IMG_BUG_UP, 16,
+ IMG_BUG_LEFT, 16,
+ IMG_BUG_DOWN, 16, HA_NEXT,
+
+ IMG_BD_BUTTERFLY, -1, HA_NEXT,
+
+ IMG_BD_FIREFLY, -1, HA_NEXT,
+
+ IMG_PACMAN_RIGHT, 16,
+ IMG_PACMAN_UP, 16,
+ IMG_PACMAN_LEFT, 16,
+ IMG_PACMAN_DOWN, 16, HA_NEXT,
+
+ IMG_YAMYAM, -1, HA_NEXT,
+
+ IMG_DARK_YAMYAM, -1, HA_NEXT,
+
+ IMG_ROBOT, -1, HA_NEXT,
+
+ IMG_MOLE_MOVING_RIGHT, 16,
+ IMG_MOLE_MOVING_UP, 16,
+ IMG_MOLE_MOVING_LEFT, 16,
+ IMG_MOLE_MOVING_DOWN, 16, HA_NEXT,
+
+ IMG_PENGUIN_MOVING_RIGHT, 16,
+ IMG_PENGUIN_MOVING_UP, 16,
+ IMG_PENGUIN_MOVING_LEFT, 16,
+ IMG_PENGUIN_MOVING_DOWN, 16, HA_NEXT,
+
+ IMG_PIG_MOVING_RIGHT, 16,
+ IMG_PIG_MOVING_UP, 16,
+ IMG_PIG_MOVING_LEFT, 16,
+ IMG_PIG_MOVING_DOWN, 16, HA_NEXT,
+
+ IMG_DRAGON_MOVING_RIGHT, 16,
+ IMG_DRAGON_MOVING_UP, 16,
+ IMG_DRAGON_MOVING_LEFT, 16,
+ IMG_DRAGON_MOVING_DOWN, 16, HA_NEXT,
+
+ IMG_SATELLITE, -1, HA_NEXT,
+
+ IMG_ROBOT_WHEEL, 50,
+ IMG_ROBOT_WHEEL_ACTIVE, 100, HA_NEXT,
+
+ IMG_LAMP, 50,
+ IMG_LAMP_ACTIVE, 50, HA_NEXT,
+
+ IMG_TIME_ORB_FULL, 50,
+ IMG_TIME_ORB_EMPTY, 50, HA_NEXT,
+
+ IMG_AMOEBA_DROP, 50,
+ IMG_AMOEBA_GROWING, 6,
+ IMG_AMOEBA_WET, 20, HA_NEXT,
+
+ IMG_AMOEBA_DEAD, -1, HA_NEXT,
+
+ IMG_AMOEBA_WET, -1, HA_NEXT,
+
+ IMG_AMOEBA_WET, 100,
+ IMG_AMOEBA_GROWING, 6, HA_NEXT,
+
+ IMG_AMOEBA_FULL, 50,
+ IMG_AMOEBA_DEAD, 50,
+ IMG_EXPLOSION, 16,
+ IMG_DIAMOND, 20, HA_NEXT,
+
+ IMG_GAME_OF_LIFE, -1, HA_NEXT,
+
+ IMG_BIOMAZE, -1, HA_NEXT,
+
+ IMG_MAGIC_WALL_ACTIVE, -1, HA_NEXT,
+
+ IMG_BD_MAGIC_WALL_ACTIVE, -1, HA_NEXT,
+
+ IMG_EXIT_CLOSED, 200,
+ IMG_EXIT_OPENING, 16,
+ IMG_EXIT_OPEN, 100, HA_NEXT,
+
+ IMG_EXIT_OPEN, -1, HA_NEXT,
+
+ IMG_SOKOBAN_OBJECT, -1, HA_NEXT,
+
+ IMG_SOKOBAN_FIELD_EMPTY, -1, HA_NEXT,
+
+ IMG_SOKOBAN_FIELD_FULL, -1, HA_NEXT,
+
+ IMG_SPEED_PILL, -1, HA_NEXT,
+
+ HA_END
+};
static char *helpscreen_eltext[][2] =
{
{"THE HERO:", "(Is _this_ guy good old Rockford?)"},
{"Normal sand:", "You can dig through it"},
{"Empty field:", "You can walk through it"},
- {"Quicksand: You cannot pass it,", "but rocks can fall though it"},
+ {"Quicksand: You cannot pass it,", "but rocks can fall through it"},
{"Massive Wall:", "Nothing can go through it"},
{"Normal Wall: You can't go through", "it, but you can bomb it away"},
{"Growing Wall: Grows in several di-", "rections if there is an empty field"},
{"Sokoban element: Field with object", "which can be pushed away"},
{"Speed pill: Lets the player run", "twice as fast as normally"},
};
-static int num_helpscreen_els = sizeof(helpscreen_eltext)/(2*sizeof(char *));
+static int num_helpscreen_els = sizeof(helpscreen_eltext) / (2*sizeof(char *));
static char *helpscreen_music[][3] =
{
static int num_helpscreen_music = 7;
static int helpscreen_musicpos;
-void DrawHelpScreenElAction(int start)
+#if 0
+void OLD_DrawHelpScreenElAction(int start)
{
int i = 0, j = 0;
int frame, graphic;
}
j++;
- DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
+ DrawOldGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
i++;
}
MarkTileDirty(1,i);
}
}
+#endif
+
+void DrawHelpScreenElAction(int start)
+{
+ int i = 0, j = 0;
+ int xstart = mSX + 16;
+ int ystart = mSY + 64 + 2 * 32;
+ int ystep = TILEY + 4;
+ int graphic;
+ int frame_count;
+ int sync_frame;
+ int frame;
+
+ while (helpscreen_action[j] != HA_END)
+ {
+ if (i >= start + MAX_HELPSCREEN_ELS || i >= num_helpscreen_els)
+ break;
+ else if (i < start)
+ {
+ while (helpscreen_action[j] != HA_NEXT)
+ j++;
+
+ j++;
+ i++;
+
+ continue;
+ }
+
+ j += 2 * helpscreen_step[i-start];
+ graphic = helpscreen_action[j++];
+ frame_count = helpscreen_action[j++];
+ if (frame_count == -1)
+ frame_count = 1000000;
+
+ if (helpscreen_frame[i-start] == 0)
+ {
+ sync_frame = 0;
+ helpscreen_frame[i-start] = frame_count - 1;
+ }
+ else
+ {
+ sync_frame = frame_count - helpscreen_frame[i-start];
+ helpscreen_frame[i-start]--;
+ }
+
+ if (helpscreen_action[j] == HA_NEXT)
+ {
+ if (!helpscreen_frame[i-start])
+ helpscreen_step[i-start] = 0;
+ }
+ else
+ {
+ if (!helpscreen_frame[i-start])
+ helpscreen_step[i-start]++;
+ while(helpscreen_action[j] != HA_NEXT)
+ j++;
+ }
+ j++;
+
+ frame = getGraphicAnimationFrame(graphic, sync_frame);
+
+ DrawGraphicExt(drawto, xstart, ystart + (i-start) * ystep,
+ graphic, frame);
+
+ i++;
+ }
+
+ for(i=2; i<16; i++)
+ {
+ MarkTileDirty(0, i);
+ MarkTileDirty(1, i);
+ }
+
+ FrameCounter++;
+}
void DrawHelpScreenElText(int start)
{
int i;
- int xstart = SX + 56, ystart = SY + 65 + 2 * 32, ystep = TILEY + 4;
+ int xstart = mSX + 56, ystart = mSY + 65 + 2 * 32, ystep = TILEY + 4;
int ybottom = SYSIZE - 20;
+ SetMainBackgroundImage(IMG_BACKGROUND_INFO);
ClearWindow();
DrawHeadline();
- DrawTextFCentered(100, FC_GREEN, "The game elements:");
+ DrawTextFCentered(100, FONT_TEXT_1, "The game elements:");
for(i=start; i < start + MAX_HELPSCREEN_ELS && i < num_helpscreen_els; i++)
{
DrawText(xstart,
ystart + (i - start) * ystep + (*helpscreen_eltext[i][1] ? 0 : 8),
- helpscreen_eltext[i][0], FS_SMALL, FC_YELLOW);
+ helpscreen_eltext[i][0], FONT_TEXT_2);
DrawText(xstart, ystart + (i - start) * ystep + 16,
- helpscreen_eltext[i][1], FS_SMALL, FC_YELLOW);
+ helpscreen_eltext[i][1], FONT_TEXT_2);
}
- DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+ DrawTextFCentered(ybottom, FONT_TEXT_4,
+ "Press any key or button for next page");
}
void DrawHelpScreenMusicText(int num)
ClearWindow();
DrawHeadline();
- DrawTextFCentered(100, FC_GREEN, "The game background music loops:");
+ DrawTextFCentered(100, FONT_TEXT_1, "The game background music loops:");
- DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
- "Excerpt from");
- DrawTextFCentered(ystart + 1 * ystep, FC_RED, "\"%s\"",
- helpscreen_music[num][0]);
- DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
- "by");
- DrawTextFCentered(ystart + 3 * ystep, FC_RED,
+ DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "Excerpt from");
+ DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3,
+ "\"%s\"", helpscreen_music[num][0]);
+ DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "by");
+ DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3,
"%s", helpscreen_music[num][1]);
- DrawTextFCentered(ystart + 4 * ystep, FC_YELLOW,
- "from the album");
- DrawTextFCentered(ystart + 5 * ystep, FC_RED, "\"%s\"",
- helpscreen_music[num][2]);
+ DrawTextFCentered(ystart + 4 * ystep, FONT_TEXT_2, "from the album");
+ DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_3,
+ "\"%s\"", helpscreen_music[num][2]);
- DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+ DrawTextFCentered(ybottom, FONT_TEXT_4,
+ "Press any key or button for next page");
#if 0
PlaySoundLoop(background_loop[num]);
ClearWindow();
DrawHeadline();
- DrawTextFCentered(100, FC_GREEN,
- "Credits:");
- DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
- "DOS port of the game:");
- DrawTextFCentered(ystart + 1 * ystep, FC_RED,
- "Guido Schulz");
- DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
- "Additional toons:");
- DrawTextFCentered(ystart + 3 * ystep, FC_RED,
- "Karl Hörnell");
- DrawTextFCentered(ystart + 5 * ystep, FC_YELLOW,
+ DrawTextFCentered(100, FONT_TEXT_1, "Credits:");
+ DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2, "DOS port of the game:");
+ DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_3, "Guido Schulz");
+ DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_2, "Additional toons:");
+ DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_3, "Karl Hörnell");
+ DrawTextFCentered(ystart + 5 * ystep, FONT_TEXT_2,
"...and many thanks to all contributors");
- DrawTextFCentered(ystart + 6 * ystep, FC_YELLOW,
- "of new levels!");
+ DrawTextFCentered(ystart + 6 * ystep, FONT_TEXT_2, "of new levels!");
- DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for next page");
+ DrawTextFCentered(ybottom, FONT_TEXT_4,
+ "Press any key or button for next page");
}
void DrawHelpScreenContactText()
ClearWindow();
DrawHeadline();
- DrawTextFCentered(100, FC_GREEN, "Program information:");
+ DrawTextFCentered(100, FONT_TEXT_1, "Program information:");
- DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
+ DrawTextFCentered(ystart + 0 * ystep, FONT_TEXT_2,
"This game is Freeware!");
- DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW,
+ DrawTextFCentered(ystart + 1 * ystep, FONT_TEXT_2,
"If you like it, send e-mail to:");
- DrawTextFCentered(ystart + 2 * ystep, FC_RED,
+ DrawTextFCentered(ystart + 2 * ystep, FONT_TEXT_3,
"info@artsoft.org");
- DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW,
+ DrawTextFCentered(ystart + 3 * ystep, FONT_TEXT_2,
"or SnailMail to:");
- DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED,
+ DrawTextFCentered(ystart + 4 * ystep + 0, FONT_TEXT_3,
"Holger Schemel");
- DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED,
+ DrawTextFCentered(ystart + 4 * ystep + 20, FONT_TEXT_3,
"Detmolder Strasse 189");
- DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED,
+ DrawTextFCentered(ystart + 4 * ystep + 40, FONT_TEXT_3,
"33604 Bielefeld");
- DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED,
+ DrawTextFCentered(ystart + 4 * ystep + 60, FONT_TEXT_3,
"Germany");
- DrawTextFCentered(ystart + 7 * ystep, FC_YELLOW,
+ DrawTextFCentered(ystart + 7 * ystep, FONT_TEXT_2,
"If you have created new levels,");
- DrawTextFCentered(ystart + 8 * ystep, FC_YELLOW,
+ DrawTextFCentered(ystart + 8 * ystep, FONT_TEXT_2,
"send them to me to include them!");
- DrawTextFCentered(ystart + 9 * ystep, FC_YELLOW,
+ DrawTextFCentered(ystart + 9 * ystep, FONT_TEXT_2,
":-)");
- DrawTextFCentered(ybottom, FC_BLUE, "Press any key or button for main menu");
+ DrawTextFCentered(ybottom, FONT_TEXT_4,
+ "Press any key or button for main menu");
}
void DrawHelpScreen()
CloseDoor(DOOR_CLOSE_2);
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
- helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
+ helpscreen_step[i] = helpscreen_frame[i] = 0;
helpscreen_musicpos = 0;
helpscreen_state = 0;
+
DrawHelpScreenElText(0);
DrawHelpScreenElAction(0);
FadeToFront();
InitAnimation();
- PlaySoundLoop(SND_MENU_INFO_SCREEN);
+
+#if 0
+ PlaySoundLoop(SND_BACKGROUND_INFO);
+#else
+ PlaySound_Menu_Start(SND_BACKGROUND_INFO);
+#endif
}
void HandleHelpScreen(int button)
if (helpscreen_state < num_helpscreen_els_pages - 1)
{
for(i=0;i<MAX_HELPSCREEN_ELS;i++)
- helpscreen_step[i] = helpscreen_frame[i] = helpscreen_delay[i] = 0;
+ helpscreen_step[i] = helpscreen_frame[i] = 0;
helpscreen_state++;
+
+ FrameCounter = 0;
DrawHelpScreenElText(helpscreen_state * MAX_HELPSCREEN_ELS);
DrawHelpScreenElAction(helpscreen_state * MAX_HELPSCREEN_ELS);
}
else
{
FadeSounds();
- DrawMainMenu();
+
game_status = MAINMENU;
+ DrawMainMenu();
}
}
else
{
- if (DelayReached(&hs_delay,GAME_FRAME_DELAY * 2))
+ if (DelayReached(&hs_delay, GAME_FRAME_DELAY))
{
if (helpscreen_state < num_helpscreen_els_pages)
- DrawHelpScreenElAction(helpscreen_state*MAX_HELPSCREEN_ELS);
+ 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);
+#if 0
+ PlaySoundLoop(SND_BACKGROUND_INFO);
+#else
+ PlaySound_Menu_Continue(SND_BACKGROUND_INFO);
+#endif
DoAnimation();
}
void HandleTypeName(int newxpos, Key key)
{
static int xpos = 0, ypos = 2;
+ int font_width = getFontWidth(FONT_INPUT_ACTIVE);
+ int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:");
+ int startx = mSX + 32 + name_width;
+ int starty = mSY + ypos * 32;
if (newxpos)
{
xpos = newxpos;
- DrawText(SX + 6*32, SY + ypos*32, setup.player_name, FS_BIG, FC_YELLOW);
- DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
+
+ DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
+ DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
+
return;
}
setup.player_name[xpos] = ascii;
setup.player_name[xpos + 1] = 0;
xpos++;
- DrawTextExt(drawto, SX + 6*32, SY + ypos*32,
- 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);
+
+ DrawText(startx, starty, setup.player_name, FONT_INPUT_ACTIVE);
+ DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_ACTIVE);
}
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);
+
+ DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_ACTIVE);
}
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);
+ DrawText(startx, starty, setup.player_name, FONT_INPUT);
+ DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_ACTIVE);
SaveSetup();
game_status = MAINMENU;
CloseDoor(DOOR_CLOSE_2);
ClearWindow();
+
HandleChooseTree(0,0, 0,0, MB_MENU_INITIALIZE, ti_ptr);
MapChooseTreeGadgets(*ti_ptr);
int num_entries = numTreeInfoInGroup(ti);
char *title_string = NULL;
int offset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : 16);
+ int last_game_status = game_status; /* save current game status */
- ClearRectangle(backbuffer, SX, SY, SXSIZE - 32, SYSIZE);
+ DrawBackground(SX, SY, SXSIZE - 32, SYSIZE);
redraw_mask |= REDRAW_FIELD;
title_string =
ti->type == TREE_TYPE_SOUNDS_DIR ? "Custom Sounds" :
ti->type == TREE_TYPE_MUSIC_DIR ? "Custom Music" : "");
- DrawText(SX + offset, SY + offset, title_string, FS_BIG,
- (ti->type == TREE_TYPE_LEVEL_DIR ? FC_GREEN : FC_YELLOW));
+ DrawText(SX + offset, SY + offset, title_string, FONT_TITLE_1);
+
+ game_status = CHOOSELEVEL; /* force LEVELS font on artwork setup screen */
for(i=0; i<num_page_entries; i++)
{
strncpy(buffer, node->name , max_buffer_len);
buffer[max_buffer_len] = '\0';
- DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color);
+ DrawText(mSX + 32, mSY + ypos * 32, buffer, FONT_TEXT_1 + node->color);
if (node->parent_link)
- initCursor(i, GFX_ARROW_BLUE_LEFT);
+ initCursor(i, IMG_MENU_BUTTON_LEFT);
else if (node->level_group)
- initCursor(i, GFX_ARROW_BLUE_RIGHT);
+ initCursor(i, IMG_MENU_BUTTON_RIGHT);
else
- initCursor(i, GFX_KUGEL_BLAU);
+ initCursor(i, IMG_MENU_BUTTON);
}
if (first_entry > 0)
- DrawGraphic(0, 1, GFX_ARROW_BLUE_UP);
+ {
+ int ypos = 1;
+
+ DrawBackground(SX, SY + ypos * 32, TILEX, TILEY);
+ DrawGraphicThruMask(0, ypos, IMG_MENU_BUTTON_UP, 0);
+ }
if (first_entry + num_page_entries < num_entries)
- DrawGraphic(0, MAX_MENU_ENTRIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN);
+ {
+ int ypos = MAX_MENU_ENTRIES_ON_SCREEN + 1;
+
+ DrawBackground(SX, SY + ypos * 32, TILEX, TILEY);
+ DrawGraphicThruMask(0, ypos, IMG_MENU_BUTTON_DOWN, 0);
+ }
+
+ game_status = last_game_status; /* restore current game status */
}
static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
node_first = getTreeInfoFirstGroupEntry(ti);
node = getTreeInfoFromPos(node_first, entry_pos);
- ClearRectangle(drawto, SX + 32, SY + 32, SXSIZE - 64, 32);
+ DrawBackground(SX + 32, SY + 32, SXSIZE - 64, 32);
if (node->parent_link)
- DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc);
+ DrawTextFCentered(40, FONT_TITLE_2, "leave group \"%s\"",
+ node->class_desc);
else if (node->level_group)
- DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc);
+ DrawTextFCentered(40, FONT_TITLE_2, "enter group \"%s\"",
+ node->class_desc);
else if (ti->type == TREE_TYPE_LEVEL_DIR)
- DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
+ DrawTextFCentered(40, FONT_TITLE_2, "%3d levels (%s)",
node->levels, node->class_desc);
/* let BackToFront() redraw only what is needed */
void DrawChooseLevel()
{
+ SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
+
DrawChooseTree(&leveldir_current);
}
FadeToFront();
InitAnimation();
+
HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
- PlaySound(SND_MENU_HALL_OF_FAME);
+
+#if 0
+ PlaySound(SND_BACKGROUND_SCORES);
+#else
+ PlaySound_Menu_Start(SND_BACKGROUND_SCORES);
+#endif
}
static void drawHallOfFameList(int first_entry, int highlight_position)
{
int i;
+ SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
ClearWindow();
- DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW);
- DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr);
+
+ DrawText(mSX + 80, mSY + 8, "Hall Of Fame", FONT_TITLE_1);
+ DrawTextFCentered(46, FONT_TITLE_2, "HighScores of Level %d", level_nr);
for(i=0; i<MAX_MENU_ENTRIES_ON_SCREEN; i++)
{
int entry = first_entry + i;
- int color = (entry == highlight_position ? FC_RED : FC_GREEN);
-#if 0
- DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG, color);
- DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG, color);
- DrawText(SX + 12 * 32, SY + 64 + i * 32,
- int2str(highscore[i].Score, 5), FS_BIG, color);
-#else
- DrawText(SX, SY + 64 + i * 32, "..................................",
- FS_MEDIUM, FC_YELLOW);
- DrawText(SX, SY + 64 + i * 32, int2str(entry + 1, 3),
- FS_MEDIUM, FC_YELLOW);
- DrawText(SX + 64, SY + 64 + i * 32, highscore[entry].Name, FS_BIG, color);
- DrawText(SX + 14 * 32 + 16, SY + 64 + i * 32,
- int2str(highscore[entry].Score, 5), FS_MEDIUM, color);
-#endif
+ DrawText(mSX, mSY + 64 + i * 32, "..................................",
+ (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
+ DrawText(mSX, mSY + 64 + i * 32, int2str(entry + 1, 3),
+ (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
+ DrawText(mSX + 64, mSY + 64 + i * 32, highscore[entry].Name,
+ (entry == highlight_position ? FONT_TEXT_3 : FONT_TEXT_1));
+ DrawText(mSX + 14 * 32 + 16, mSY + 64 + i * 32,
+ int2str(highscore[entry].Score, 5),
+ (entry == highlight_position ? FONT_TEXT_4 : FONT_TEXT_2));
}
}
if (button_released)
{
- FadeSound(SND_MENU_HALL_OF_FAME);
+ FadeSound(SND_BACKGROUND_SCORES);
game_status = MAINMENU;
DrawMainMenu();
}
BackToFront();
if (game_status == HALLOFFAME)
+ {
DoAnimation();
+#if 1
+ PlaySound_Menu_Continue(SND_BACKGROUND_SCORES);
+#endif
+ }
}
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 execSetupEditor()
+{
+ setup_mode = SETUP_MODE_EDITOR;
+ DrawSetupScreen();
+}
+
static void execSetupGraphics()
{
setup_mode = SETUP_MODE_GRAPHICS;
/* needed if last screen (setup choice) changed graphics, sounds or music */
ReloadCustomArtwork();
- setup.graphics_set = artwork.gfx_current->name;
- setup.sounds_set = artwork.snd_current->name;
- setup.music_set = artwork.mus_current->name;
+ 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 struct TokenInfo setup_info_main[] =
{
{ TYPE_ENTER_MENU, execSetupGame, "Game Settings" },
+ { TYPE_ENTER_MENU, execSetupEditor, "Editor Settings" },
{ TYPE_ENTER_MENU, execSetupGraphics, "Graphics" },
{ TYPE_ENTER_MENU, execSetupSound, "Sound & Music" },
{ TYPE_ENTER_MENU, execSetupArtwork, "Custom Artwork" },
{ TYPE_ENTER_MENU, execSetupShortcut, "Key Shortcuts" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execExitSetup, "Exit" },
- { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and exit" },
+ { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and Exit" },
{ 0, NULL, NULL }
};
{ TYPE_SWITCH, &setup.time_limit, "Timelimit:" },
{ TYPE_SWITCH, &setup.autorecord, "Auto-Record:" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
+ { 0, NULL, NULL }
+};
+
+static struct TokenInfo setup_info_editor[] =
+{
+ { TYPE_STRING, NULL, "Offer Special Elements:"},
+ { TYPE_SWITCH, &setup.editor.el_boulderdash, "BoulderDash:" },
+ { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" },
+ { TYPE_SWITCH, &setup.editor.el_more, "More:" },
+ { TYPE_SWITCH, &setup.editor.el_sokoban, "Sokoban:" },
+ { TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" },
+ { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamd. Caves:" },
+ { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX Boulderd.:" },
+ { TYPE_SWITCH, &setup.editor.el_chars, "Characters:" },
+ { TYPE_SWITCH, &setup.editor.el_custom, "Custom:" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
{ TYPE_SWITCH, &setup.quick_doors, "Quick Doors:" },
{ TYPE_SWITCH, &setup.toons, "Toons:" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 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" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
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:" },
{ TYPE_YES_NO, &setup.override_level_sounds, "Sounds:" },
{ TYPE_YES_NO, &setup.override_level_music, "Music:" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
{ TYPE_EMPTY, NULL, "" },
{ TYPE_YES_NO, &setup.ask_on_escape, "Ask on Esc:" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_LEAVE_MENU, execSetupMain, "Exit" },
+ { TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
{
int xpos = MENU_SCREEN_VALUE_XPOS;
int ypos = MENU_SCREEN_START_YPOS + pos;
- int font_size = FS_BIG;
- int font_color = FC_YELLOW;
+ int font_nr = FONT_VALUE_1;
char *value_string = getSetupValue(setup_info[pos].type & ~TYPE_GHOSTED,
setup_info[pos].value);
if (setup_info[pos].type & TYPE_QUERY)
{
value_string = "<press key>";
- font_color = FC_RED;
+ font_nr = FONT_INPUT_ACTIVE;
}
}
else if (setup_info[pos].type & TYPE_STRING)
int max_value_len = (SCR_FIELDX - 2) * 2;
xpos = 1;
- font_size = FS_MEDIUM;
+ font_nr = FONT_VALUE_2;
if (strlen(value_string) > max_value_len)
value_string[max_value_len] = '\0';
}
else if (setup_info[pos].type & TYPE_BOOLEAN_STYLE &&
!*(boolean *)(setup_info[pos].value))
- font_color = FC_BLUE;
+ font_nr = FONT_OPTION_OFF;
- DrawText(SX + xpos * 32, SY + ypos * 32,
- (xpos == 3 ? " " : " "), FS_BIG, FC_YELLOW);
- DrawText(SX + xpos * 32, SY + ypos * 32, value_string, font_size,font_color);
+ DrawText(mSX + xpos * 32, mSY + ypos * 32,
+ (xpos == 3 ? " " : " "), font_nr);
+ DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr);
}
static void changeSetupValue(int pos)
UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
+
ClearWindow();
if (setup_mode == SETUP_MODE_MAIN)
setup_info = setup_info_game;
title_string = "Setup Game";
}
+ else if (setup_mode == SETUP_MODE_EDITOR)
+ {
+ setup_info = setup_info_editor;
+ title_string = "Setup Editor";
+ }
else if (setup_mode == SETUP_MODE_GRAPHICS)
{
setup_info = setup_info_graphics;
title_string = "Setup Shortcuts";
}
- DrawText(SX + 16, SY + 16, title_string, FS_BIG, FC_YELLOW);
+ DrawText(mSX + 16, mSY + 16, title_string, FONT_TITLE_1);
num_setup_info = 0;
for(i=0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
{
void *value_ptr = setup_info[i].value;
int ypos = MENU_SCREEN_START_YPOS + i;
- int font_size = FS_BIG;
+ int font_nr = FONT_MENU_1;
/* set some entries to "unchangeable" according to other variables */
if ((value_ptr == &setup.sound && !audio.sound_available) ||
setup_info[i].type |= TYPE_GHOSTED;
if (setup_info[i].type & TYPE_STRING)
- font_size = FS_MEDIUM;
+ font_nr = FONT_MENU_2;
- DrawText(SX + 32, SY + ypos * 32, setup_info[i].text, font_size, FC_GREEN);
+ DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr);
if (setup_info[i].type & TYPE_ENTER_MENU)
- initCursor(i, GFX_ARROW_BLUE_RIGHT);
+ initCursor(i, IMG_MENU_BUTTON_RIGHT);
else if (setup_info[i].type & TYPE_LEAVE_MENU)
- initCursor(i, GFX_ARROW_BLUE_LEFT);
+ initCursor(i, IMG_MENU_BUTTON_LEFT);
else if (setup_info[i].type & ~TYPE_SKIP_ENTRY)
- initCursor(i, GFX_KUGEL_BLAU);
+ initCursor(i, IMG_MENU_BUTTON);
if (setup_info[i].type & TYPE_VALUE)
drawSetupValue(i);
void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
{
static int choice_store[MAX_SETUP_MODES];
- int choice = choice_store[setup_mode];
+ int choice = choice_store[setup_mode]; /* always starts with 0 */
int x = 0;
int y = choice;
if (button == MB_MENU_INITIALIZE)
{
+ /* advance to first valid menu entry */
+ while (choice < num_setup_info &&
+ (setup_info[choice].type & TYPE_SKIP_ENTRY))
+ choice++;
+ choice_store[setup_mode] = choice;
+
drawCursor(choice, FC_RED);
return;
}
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);
+ DrawText(mSX+16, mSY+16, "Setup Input", FONT_TITLE_1);
- DrawGraphic(10, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_LEFT);
- DrawGraphic(12, MENU_SCREEN_START_YPOS, GFX_ARROW_BLUE_RIGHT);
+ initCursor(0, IMG_MENU_BUTTON);
+ initCursor(1, IMG_MENU_BUTTON);
+ initCursor(2, IMG_MENU_BUTTON_RIGHT);
+ initCursor(13, IMG_MENU_BUTTON_LEFT);
- 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);
+ drawCursorXY(10, 0, IMG_MENU_BUTTON_LEFT);
+ drawCursorXY(12, 0, IMG_MENU_BUTTON_RIGHT);
+
+ DrawText(mSX+32, mSY+2*32, "Player:", FONT_MENU_1);
+ DrawText(mSX+32, mSY+3*32, "Device:", FONT_MENU_1);
+ DrawText(mSX+32, mSY+15*32, "Back", FONT_MENU_1);
#if 0
DeactivateJoystickForCalibration();
- DrawTextFCentered(SYSIZE - 20, FC_BLUE,
+ DrawTextFCentered(SYSIZE - 20, FONT_TEXT_4,
"Joysticks deactivated on this screen");
#endif
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);
+ DrawText(mSX+11*32, mSY+2*32, int2str(player_nr + 1, 1), FONT_INPUT_ACTIVE);
+#if 1
+ DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
+ PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#else
+ DrawGraphicThruMask(8, 2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+#endif
if (setup.input[player_nr].use_joystick)
{
char *device_name = setup.input[player_nr].joy.device_name;
- DrawText(SX+8*32, SY+3*32,
+ DrawText(mSX+8*32, mSY+3*32,
joystick_name[getJoystickNrFromDeviceName(device_name)],
- FS_BIG, FC_YELLOW);
- DrawText(SX+32, SY+4*32, "Calibrate", FS_BIG, FC_GREEN);
+ FONT_VALUE_1);
+ DrawText(mSX+32, mSY+4*32, "Calibrate", FONT_MENU_1);
}
else
{
- DrawText(SX+8*32, SY+3*32, "Keyboard ", FS_BIG, FC_YELLOW);
- DrawText(SX+32, SY+4*32, "Customize", FS_BIG, FC_GREEN);
+ DrawText(mSX+8*32, mSY+3*32, "Keyboard ", FONT_VALUE_1);
+ DrawText(mSX+32, mSY+4*32, "Customize", FONT_MENU_1);
}
- 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);
- 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);
- DrawText(SX+2*32, SY+9*32, ":", FS_BIG, FC_BLUE);
- DrawText(SX+32, SY+10*32, "Snap Field:", FS_BIG, FC_BLUE);
- DrawText(SX+32, SY+12*32, "Place Bomb:", FS_BIG, FC_BLUE);
+ DrawText(mSX+32, mSY+5*32, "Actual Settings:", FONT_MENU_1);
+ drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
+ drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
+ drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
+ drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+ DrawText(mSX+2*32, mSY+6*32, ":", FONT_VALUE_OLD);
+ DrawText(mSX+2*32, mSY+7*32, ":", FONT_VALUE_OLD);
+ 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);
for (i=0; i<6; i++)
{
int ypos = 6 + i + (i > 3 ? i-3 : 0);
- DrawText(SX + 3*32, SY + ypos*32,
- " ", FS_BIG, FC_YELLOW);
- DrawText(SX + 3*32, SY + ypos*32,
+ DrawText(mSX + 3*32, mSY + ypos*32,
+ " ", FONT_VALUE_1);
+ DrawText(mSX + 3*32, mSY + ypos*32,
(setup.input[player_nr].use_joystick ?
custom[i].text :
- getKeyNameFromKey(*custom[i].key)),
- FS_BIG, FC_YELLOW);
+ getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
}
}
custom_key = setup.input[player_nr].key;
ClearWindow();
- DrawText(SX + 16, SY + 16, "Keyboard Input", FS_BIG, FC_YELLOW);
+ DrawText(mSX + 16, mSY + 16, "Keyboard Input", FONT_TITLE_1);
BackToFront();
InitAnimation();
step_nr = 0;
- DrawText(SX, SY + (2+2*step_nr)*32,
- customize_step[step_nr].text, FS_BIG, FC_RED);
- 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,
- getKeyNameFromKey(*customize_step[step_nr].key),
- FS_BIG, FC_BLUE);
+ DrawText(mSX, mSY + (2+2*step_nr)*32,
+ customize_step[step_nr].text, FONT_INPUT_ACTIVE);
+ DrawText(mSX, mSY + (2+2*step_nr+1)*32,
+ "Key:", FONT_INPUT_ACTIVE);
+ DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
+ getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
while(!finished)
{
{
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))
{
/* got new key binding */
*customize_step[step_nr].key = key;
- 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,
- getKeyNameFromKey(key), FS_BIG, FC_YELLOW);
+ DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
+ " ", FONT_VALUE_1);
+ DrawText(mSX + 4*32, mSY + (2+2*step_nr+1)*32,
+ getKeyNameFromKey(key), FONT_VALUE_1);
step_nr++;
/* un-highlight last query */
- DrawText(SX, SY+(2+2*(step_nr-1))*32,
- customize_step[step_nr-1].text, FS_BIG, FC_GREEN);
- DrawText(SX, SY+(2+2*(step_nr-1)+1)*32,
- "Key:", FS_BIG, FC_GREEN);
+ DrawText(mSX, mSY+(2+2*(step_nr-1))*32,
+ customize_step[step_nr-1].text, FONT_MENU_1);
+ DrawText(mSX, mSY+(2+2*(step_nr-1)+1)*32,
+ "Key:", FONT_MENU_1);
/* press 'Enter' to leave */
if (step_nr == 6)
{
- DrawText(SX + 16, SY + 15*32+16,
- "Press Enter", FS_BIG, FC_YELLOW);
+ DrawText(mSX + 16, mSY + 15*32+16,
+ "Press Enter", FONT_TITLE_1);
break;
}
/* query next key binding */
- DrawText(SX, SY+(2+2*step_nr)*32,
- customize_step[step_nr].text, FS_BIG, FC_RED);
- 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,
+ DrawText(mSX, mSY+(2+2*step_nr)*32,
+ customize_step[step_nr].text, FONT_INPUT_ACTIVE);
+ DrawText(mSX, mSY+(2+2*step_nr+1)*32,
+ "Key:", FONT_INPUT_ACTIVE);
+ DrawText(mSX + 4*32, mSY+(2+2*step_nr+1)*32,
getKeyNameFromKey(*customize_step[step_nr].key),
- FS_BIG, FC_BLUE);
+ FONT_VALUE_OLD);
}
break;
ClearWindow();
- for(y=0; y<3; y++)
+ for(y=0; y < 3; y++)
{
- for(x=0; x<3; x++)
+ for(x=0; x < 3; x++)
{
+ DrawGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
check[x][y] = FALSE;
- DrawGraphic(xpos + x - 1, ypos + y - 1, GFX_KUGEL_BLAU);
}
}
- DrawText(SX, SY + 6 * 32, " ROTATE JOYSTICK ", FS_BIG, FC_YELLOW);
- DrawText(SX, SY + 7 * 32, "IN ALL DIRECTIONS", FS_BIG, FC_YELLOW);
- DrawText(SX + 16, SY + 9 * 32, " IF ALL BALLS ", FS_BIG, FC_YELLOW);
- DrawText(SX, SY + 10 * 32, " ARE YELLOW, ", FS_BIG, FC_YELLOW);
- DrawText(SX, SY + 11 * 32, " CENTER JOYSTICK ", FS_BIG, FC_YELLOW);
- DrawText(SX, SY + 12 * 32, " AND ", FS_BIG, FC_YELLOW);
- DrawText(SX, SY + 13 * 32, "PRESS ANY BUTTON!", FS_BIG, FC_YELLOW);
+ DrawText(mSX, mSY + 6 * 32, " ROTATE JOYSTICK ", FONT_TITLE_1);
+ DrawText(mSX, mSY + 7 * 32, "IN ALL DIRECTIONS", FONT_TITLE_1);
+ DrawText(mSX + 16, mSY + 9 * 32, " IF ALL BALLS ", FONT_TITLE_1);
+ DrawText(mSX, mSY + 10 * 32, " ARE YELLOW, ", FONT_TITLE_1);
+ DrawText(mSX, mSY + 11 * 32, " CENTER JOYSTICK ", FONT_TITLE_1);
+ DrawText(mSX, mSY + 12 * 32, " AND ", FONT_TITLE_1);
+ DrawText(mSX, mSY + 13 * 32, "PRESS ANY BUTTON!", FONT_TITLE_1);
joy_value = Joystick(player_nr);
last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 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_MENU_CALIBRATE_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_MENU_CALIBRATE_YELLOW, 0);
+ DrawGraphic(xpos + x, ypos + y, IMG_MENU_CALIBRATE_RED, 0);
last_x = x;
last_y = y;
{
ClearWindow();
- DrawText(SX + 16, SY + 6*32, " JOYSTICK NOT ", FS_BIG, FC_YELLOW);
- DrawText(SX, SY + 7*32, " AVAILABLE ", FS_BIG, FC_YELLOW);
+ DrawText(mSX + 16, mSY + 6*32, " JOYSTICK NOT ", FONT_TITLE_1);
+ DrawText(mSX, mSY + 7*32, " AVAILABLE ", FONT_TITLE_1);
BackToFront();
Delay(2000); /* show error message for two seconds */
}
{
DeactivateJoystick();
+ SetMainBackgroundImage(IMG_BACKGROUND_SETUP);
+
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_MENU_BUTTON_UP, IMG_MENU_BUTTON_UP_ACTIVE,
+ SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS,
SCREEN_CTRL_ID_SCROLL_UP,
"scroll up"
},
{
- SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS,
- SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
+ IMG_MENU_BUTTON_DOWN, IMG_MENU_BUTTON_DOWN_ACTIVE,
+ SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
SCREEN_CTRL_ID_SCROLL_DOWN,
"scroll down"
}
static struct
{
- int xpos, ypos;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ Bitmap **gfx_unpressed, **gfx_pressed;
+#else
+ int gfx_unpressed, gfx_pressed;
+#endif
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,
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ &scrollbar_bitmap[0], &scrollbar_bitmap[1],
+#else
+ IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE,
+#endif
+ 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 = graphic_info[gfx_unpressed].bitmap;
+ gd_bitmap_pressed = graphic_info[gfx_pressed].bitmap;
+ gd_x1 = graphic_info[gfx_unpressed].src_x;
+ gd_y1 = graphic_info[gfx_unpressed].src_y;
+ gd_x2 = graphic_info[gfx_pressed].src_x;
+ gd_y2 = 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;
+#if !defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ int gfx_unpressed, gfx_pressed;
+#endif
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;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ gd_bitmap_unpressed = *scrollbar_info[i].gfx_unpressed;
+ gd_bitmap_pressed = *scrollbar_info[i].gfx_pressed;
+ gd_x1 = 0;
+ gd_y1 = 0;
+ gd_x2 = 0;
+ gd_y2 = 0;
+#else
+ gfx_unpressed = scrollbar_info[i].gfx_unpressed;
+ gfx_pressed = scrollbar_info[i].gfx_pressed;
+ gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
+ gd_bitmap_pressed = graphic_info[gfx_pressed].bitmap;
+ gd_x1 = graphic_info[gfx_unpressed].src_x;
+ gd_y1 = graphic_info[gfx_unpressed].src_y;
+ gd_x2 = graphic_info[gfx_pressed].src_x;
+ gd_y2 = graphic_info[gfx_pressed].src_y;
+#endif
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,
void CreateScreenGadgets()
{
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ int i;
+
+ for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++)
+ {
+ scrollbar_bitmap[i] = CreateBitmap(TILEX, TILEY, DEFAULT_DEPTH);
+
+ /* copy pointers to clip mask and GC */
+ scrollbar_bitmap[i]->clip_mask =
+ graphic_info[IMG_MENU_SCROLLBAR + i].clip_mask;
+ scrollbar_bitmap[i]->stored_clip_gc =
+ graphic_info[IMG_MENU_SCROLLBAR + i].clip_gc;
+
+ BlitBitmap(graphic_info[IMG_MENU_SCROLLBAR + i].bitmap,
+ scrollbar_bitmap[i],
+ graphic_info[IMG_MENU_SCROLLBAR + i].src_x,
+ graphic_info[IMG_MENU_SCROLLBAR + i].src_y,
+ TILEX, TILEY, 0, 0);
+ }
+#endif
+
CreateScreenScrollbuttons();
CreateScreenScrollbars();
}
+void FreeScreenGadgets()
+{
+ int i;
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+ for (i=0; i < NUM_SCROLLBAR_BITMAPS; i++)
+ {
+ /* prevent freeing clip mask and GC twice */
+ scrollbar_bitmap[i]->clip_mask = None;
+ scrollbar_bitmap[i]->stored_clip_gc = None;
+
+ FreeBitmap(scrollbar_bitmap[i]);
+ }
+#endif
+
+ for (i=0; i<NUM_SCREEN_GADGETS; i++)
+ FreeGadget(screen_gadget[i]);
+}
+
void MapChooseTreeGadgets(TreeInfo *ti)
{
int num_entries = numTreeInfoInGroup(ti);
projects / rocksndiamonds.git / blobdiff