X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=b2815d94539d92823baa700818d5afcf53771c37;hb=370a25a79d2e8df1e6e3e4cb4be39496d0190c28;hp=4403a9cedd220d636cae487874bc1b282a8ce31c;hpb=0a4bbe85a69ae2fc05d05c2e1fee44f2b1c44134;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 4403a9ce..b2815d94 100644 --- a/src/tools.c +++ b/src/tools.c @@ -319,6 +319,7 @@ void ClearWindow() int getFontWidth(int font_size, int font_type) { return (font_size == FS_BIG ? FONT1_XSIZE : + font_size == FS_MEDIUM ? FONT6_XSIZE : font_type == FC_SPECIAL1 ? FONT3_XSIZE : font_type == FC_SPECIAL2 ? FONT4_XSIZE : font_type == FC_SPECIAL3 ? FONT5_XSIZE : @@ -328,12 +329,24 @@ int getFontWidth(int font_size, int font_type) int getFontHeight(int font_size, int font_type) { return (font_size == FS_BIG ? FONT1_YSIZE : + font_size == FS_MEDIUM ? FONT6_YSIZE : font_type == FC_SPECIAL1 ? FONT3_YSIZE : font_type == FC_SPECIAL2 ? FONT4_YSIZE : font_type == FC_SPECIAL3 ? FONT5_YSIZE : FONT2_YSIZE); } +void DrawInitText(char *text, int ypos, int color) +{ + if (display && window && pix[PIX_SMALLFONT]) + { + XFillRectangle(display, window, gc, 0, ypos, WIN_XSIZE, FONT2_YSIZE); + DrawTextExt(window, gc, (WIN_XSIZE - strlen(text) * FONT2_XSIZE)/2, + ypos,text,FS_SMALL,color); + XFlush(display); + } +} + void DrawTextFCentered(int y, int font_type, char *format, ...) { char buffer[FULL_SXSIZE / FONT5_XSIZE + 10]; @@ -377,7 +390,7 @@ void DrawTextExt(Drawable d, GC gc, int x, int y, int font_pixmap; boolean print_inverse = FALSE; - if (font_size != FS_SMALL && font_size != FS_BIG) + if (font_size != FS_SMALL && font_size != FS_BIG && font_size != FS_MEDIUM) font_size = FS_SMALL; if (font_type < FC_RED || font_type > FC_SPECIAL3) font_type = FC_RED; @@ -385,8 +398,12 @@ void DrawTextExt(Drawable d, GC gc, int x, int y, font_width = getFontWidth(font_size, font_type); font_height = getFontHeight(font_size, font_type); - font_pixmap = (font_size == FS_BIG ? PIX_BIGFONT : PIX_SMALLFONT); - font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE : FONT2_YSIZE) * + font_pixmap = (font_size == FS_BIG ? PIX_BIGFONT : + font_size == FS_MEDIUM ? PIX_MEDIUMFONT : + PIX_SMALLFONT); + font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE : + font_size == FS_MEDIUM ? FONT6_YSIZE : + FONT2_YSIZE) * FONT_LINES_PER_FONT); if (font_type == FC_SPECIAL3) @@ -606,9 +623,14 @@ void DrawPlayer(struct PlayerInfo *player) DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, NO_CUTTING); - if (FORCE_FIELD_ON(player)) - DrawGraphicAnimationShiftedThruMask(sx, sy, sxx, syy, GFX_FUNKELN_BLAU, + if (SHIELD_ON(player)) + { + int graphic = (player->shield_active_time_left ? GFX2_SHIELD_ACTIVE : + GFX2_SHIELD_PASSIVE); + + DrawGraphicAnimationShiftedThruMask(sx, sy, sxx, syy, graphic, 3, 8, ANIM_OSCILLATE); + } if (player->Pushing && player->GfxPos) { @@ -779,6 +801,13 @@ void getGraphicSource(int graphic, int *pixmap_nr, int *x, int *y) *x = (graphic % DC_PER_LINE) * TILEX; *y = (graphic / DC_PER_LINE) * TILEY; } + else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE) + { + graphic -= GFX_START_ROCKSMORE; + *pixmap_nr = PIX_MORE; + *x = (graphic % MORE_PER_LINE) * TILEX; + *y = (graphic / MORE_PER_LINE) * TILEY; + } else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT) { graphic -= GFX_START_ROCKSFONT; @@ -1096,23 +1125,23 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, { graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_NORMAL); } - else if (element == EL_MAULWURF || element == EL_PINGUIN || + else if (element == EL_MOLE || element == EL_PINGUIN || element == EL_SCHWEIN || element == EL_DRACHE) { if (dir == MV_LEFT) - graphic = (element == EL_MAULWURF ? GFX_MAULWURF_LEFT : + graphic = (element == EL_MOLE ? GFX_MOLE_LEFT : element == EL_PINGUIN ? GFX_PINGUIN_LEFT : element == EL_SCHWEIN ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT); else if (dir == MV_RIGHT) - graphic = (element == EL_MAULWURF ? GFX_MAULWURF_RIGHT : + graphic = (element == EL_MOLE ? GFX_MOLE_RIGHT : element == EL_PINGUIN ? GFX_PINGUIN_RIGHT : element == EL_SCHWEIN ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT); else if (dir == MV_UP) - graphic = (element == EL_MAULWURF ? GFX_MAULWURF_UP : + graphic = (element == EL_MOLE ? GFX_MOLE_UP : element == EL_PINGUIN ? GFX_PINGUIN_UP : element == EL_SCHWEIN ? GFX_SCHWEIN_UP : GFX_DRACHE_UP); else - graphic = (element == EL_MAULWURF ? GFX_MAULWURF_DOWN : + graphic = (element == EL_MOLE ? GFX_MOLE_DOWN : element == EL_PINGUIN ? GFX_PINGUIN_DOWN : element == EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN); @@ -1130,6 +1159,10 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, { graphic += !phase2; } + else if (element == EL_BALLOON) + { + graphic += phase4; + } else if ((element == EL_FELSBROCKEN || element == EL_SP_ZONK || IS_GEM(element)) && !cut_mode) { @@ -1604,7 +1637,7 @@ static void DrawMicroLevelLabelExt(int mode) mode == MICROLABEL_LEVEL_AUTHOR ? level.author : mode == MICROLABEL_IMPORTED_FROM ? "imported from" : mode == MICROLABEL_LEVEL_IMPORT_INFO ? - leveldir[leveldir_nr].imported_from : ""), + leveldir_current->imported_from : ""), MAX_MICROLABEL_SIZE); label_text[MAX_MICROLABEL_SIZE] = '\0'; @@ -1687,12 +1720,12 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) /* redraw micro level label, if needed */ if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 && strcmp(level.author, ANONYMOUS_NAME) != 0 && - strcmp(level.author, leveldir[leveldir_nr].name) != 0 && + strcmp(level.author, leveldir_current->name) != 0 && DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY)) { int max_label_counter = 23; - if (leveldir[leveldir_nr].imported_from != NULL) + if (leveldir_current->imported_from != NULL) max_label_counter += 14; label_counter = (label_counter + 1) % max_label_counter; @@ -2363,25 +2396,25 @@ int el2gfx(int element) case EL_SPIELER3: return GFX_SPIELER3; case EL_SPIELER4: return GFX_SPIELER4; case EL_KAEFER: return GFX_KAEFER; - case EL_KAEFER_R: return GFX_KAEFER_R; - case EL_KAEFER_O: return GFX_KAEFER_O; - case EL_KAEFER_L: return GFX_KAEFER_L; - case EL_KAEFER_U: return GFX_KAEFER_U; + case EL_KAEFER_RIGHT: return GFX_KAEFER_RIGHT; + case EL_KAEFER_UP: return GFX_KAEFER_UP; + case EL_KAEFER_LEFT: return GFX_KAEFER_LEFT; + case EL_KAEFER_DOWN: return GFX_KAEFER_DOWN; case EL_FLIEGER: return GFX_FLIEGER; - case EL_FLIEGER_R: return GFX_FLIEGER_R; - case EL_FLIEGER_O: return GFX_FLIEGER_O; - case EL_FLIEGER_L: return GFX_FLIEGER_L; - case EL_FLIEGER_U: return GFX_FLIEGER_U; + case EL_FLIEGER_RIGHT: return GFX_FLIEGER_RIGHT; + case EL_FLIEGER_UP: return GFX_FLIEGER_UP; + case EL_FLIEGER_LEFT: return GFX_FLIEGER_LEFT; + case EL_FLIEGER_DOWN: return GFX_FLIEGER_DOWN; case EL_BUTTERFLY: return GFX_BUTTERFLY; - case EL_BUTTERFLY_R: return GFX_BUTTERFLY_R; - case EL_BUTTERFLY_O: return GFX_BUTTERFLY_O; - case EL_BUTTERFLY_L: return GFX_BUTTERFLY_L; - case EL_BUTTERFLY_U: return GFX_BUTTERFLY_U; + case EL_BUTTERFLY_RIGHT: return GFX_BUTTERFLY_RIGHT; + case EL_BUTTERFLY_UP: return GFX_BUTTERFLY_UP; + case EL_BUTTERFLY_LEFT: return GFX_BUTTERFLY_LEFT; + case EL_BUTTERFLY_DOWN: return GFX_BUTTERFLY_DOWN; case EL_FIREFLY: return GFX_FIREFLY; - case EL_FIREFLY_R: return GFX_FIREFLY_R; - case EL_FIREFLY_O: return GFX_FIREFLY_O; - case EL_FIREFLY_L: return GFX_FIREFLY_L; - case EL_FIREFLY_U: return GFX_FIREFLY_U; + case EL_FIREFLY_RIGHT: return GFX_FIREFLY_RIGHT; + case EL_FIREFLY_UP: return GFX_FIREFLY_UP; + case EL_FIREFLY_LEFT: return GFX_FIREFLY_LEFT; + case EL_FIREFLY_DOWN: return GFX_FIREFLY_DOWN; case EL_MAMPFER: return GFX_MAMPFER; case EL_ROBOT: return GFX_ROBOT; case EL_BETON: return GFX_BETON; @@ -2427,10 +2460,10 @@ int el2gfx(int element) case EL_PFORTE4X: return GFX_PFORTE4X; case EL_DYNAMITE_INACTIVE: return GFX_DYNAMIT_AUS; case EL_PACMAN: return GFX_PACMAN; - case EL_PACMAN_R: return GFX_PACMAN_R; - case EL_PACMAN_O: return GFX_PACMAN_O; - case EL_PACMAN_L: return GFX_PACMAN_L; - case EL_PACMAN_U: return GFX_PACMAN_U; + case EL_PACMAN_RIGHT: return GFX_PACMAN_RIGHT; + case EL_PACMAN_UP: return GFX_PACMAN_UP; + case EL_PACMAN_LEFT: return GFX_PACMAN_LEFT; + case EL_PACMAN_DOWN: return GFX_PACMAN_DOWN; case EL_UNSICHTBAR: return GFX_UNSICHTBAR; case EL_ERZ_EDEL: return GFX_ERZ_EDEL; case EL_ERZ_DIAM: return GFX_ERZ_DIAM; @@ -2465,15 +2498,15 @@ int el2gfx(int element) case EL_SOKOBAN_OBJEKT: return GFX_SOKOBAN_OBJEKT; case EL_SOKOBAN_FELD_LEER: return GFX_SOKOBAN_FELD_LEER; case EL_SOKOBAN_FELD_VOLL: return GFX_SOKOBAN_FELD_VOLL; - case EL_MAULWURF: return GFX_MAULWURF; + case EL_MOLE: return GFX_MOLE; case EL_PINGUIN: return GFX_PINGUIN; case EL_SCHWEIN: return GFX_SCHWEIN; case EL_DRACHE: return GFX_DRACHE; case EL_SONDE: return GFX_SONDE; - case EL_PFEIL_L: return GFX_PFEIL_L; - case EL_PFEIL_R: return GFX_PFEIL_R; - case EL_PFEIL_O: return GFX_PFEIL_O; - case EL_PFEIL_U: return GFX_PFEIL_U; + case EL_PFEIL_LEFT: return GFX_PFEIL_LEFT; + case EL_PFEIL_RIGHT: return GFX_PFEIL_RIGHT; + case EL_PFEIL_UP: return GFX_PFEIL_UP; + case EL_PFEIL_DOWN: return GFX_PFEIL_DOWN; case EL_SPEED_PILL: return GFX_SPEED_PILL; case EL_SP_TERMINAL_ACTIVE: return GFX_SP_TERMINAL; case EL_SP_BUG_ACTIVE: return GFX_SP_BUG_ACTIVE; @@ -2504,39 +2537,37 @@ int el2gfx(int element) case EL_DOOR_WHITE: return GFX_DOOR_WHITE; case EL_DOOR_WHITE_GRAY: return GFX_DOOR_WHITE_GRAY; case EL_KEY_WHITE: return GFX_KEY_WHITE; - case EL_FORCE_FIELD_PASSIVE:return GFX_FORCE_FIELD_PASSIVE; - case EL_FORCE_FIELD_ACTIVE: return GFX_FORCE_FIELD_ACTIVE; + case EL_SHIELD_PASSIVE: return GFX_SHIELD_PASSIVE; + case EL_SHIELD_ACTIVE: return GFX_SHIELD_ACTIVE; case EL_EXTRA_TIME: return GFX_EXTRA_TIME; case EL_SWITCHGATE_OPEN: return GFX_SWITCHGATE_OPEN; case EL_SWITCHGATE_CLOSED: return GFX_SWITCHGATE_CLOSED; case EL_SWITCHGATE_SWITCH_1:return GFX_SWITCHGATE_SWITCH_1; case EL_SWITCHGATE_SWITCH_2:return GFX_SWITCHGATE_SWITCH_2; - case EL_TIME_GATE: return GFX_TIME_GATE; - case EL_TIME_GATE_WHEEL: return GFX_TIME_GATE_WHEEL; case EL_BELT1_LEFT: return GFX_BELT1_LEFT; case EL_BELT1_MIDDLE: return GFX_BELT1_MIDDLE; case EL_BELT1_RIGHT: return GFX_BELT1_RIGHT; - case EL_BELT1_SWITCH_L: return GFX_BELT1_SWITCH_L; - case EL_BELT1_SWITCH_M: return GFX_BELT1_SWITCH_M; - case EL_BELT1_SWITCH_R: return GFX_BELT1_SWITCH_R; + case EL_BELT1_SWITCH_LEFT: return GFX_BELT1_SWITCH_LEFT; + case EL_BELT1_SWITCH_MIDDLE:return GFX_BELT1_SWITCH_MIDDLE; + case EL_BELT1_SWITCH_RIGHT: return GFX_BELT1_SWITCH_RIGHT; case EL_BELT2_LEFT: return GFX_BELT2_LEFT; case EL_BELT2_MIDDLE: return GFX_BELT2_MIDDLE; case EL_BELT2_RIGHT: return GFX_BELT2_RIGHT; - case EL_BELT2_SWITCH_L: return GFX_BELT2_SWITCH_L; - case EL_BELT2_SWITCH_M: return GFX_BELT2_SWITCH_M; - case EL_BELT2_SWITCH_R: return GFX_BELT2_SWITCH_R; + case EL_BELT2_SWITCH_LEFT: return GFX_BELT2_SWITCH_LEFT; + case EL_BELT2_SWITCH_MIDDLE:return GFX_BELT2_SWITCH_MIDDLE; + case EL_BELT2_SWITCH_RIGHT: return GFX_BELT2_SWITCH_RIGHT; case EL_BELT3_LEFT: return GFX_BELT3_LEFT; case EL_BELT3_MIDDLE: return GFX_BELT3_MIDDLE; case EL_BELT3_RIGHT: return GFX_BELT3_RIGHT; - case EL_BELT3_SWITCH_L: return GFX_BELT3_SWITCH_L; - case EL_BELT3_SWITCH_M: return GFX_BELT3_SWITCH_M; - case EL_BELT3_SWITCH_R: return GFX_BELT3_SWITCH_R; + case EL_BELT3_SWITCH_LEFT: return GFX_BELT3_SWITCH_LEFT; + case EL_BELT3_SWITCH_MIDDLE:return GFX_BELT3_SWITCH_MIDDLE; + case EL_BELT3_SWITCH_RIGHT: return GFX_BELT3_SWITCH_RIGHT; case EL_BELT4_LEFT: return GFX_BELT4_LEFT; case EL_BELT4_MIDDLE: return GFX_BELT4_MIDDLE; case EL_BELT4_RIGHT: return GFX_BELT4_RIGHT; - case EL_BELT4_SWITCH_L: return GFX_BELT4_SWITCH_L; - case EL_BELT4_SWITCH_M: return GFX_BELT4_SWITCH_M; - case EL_BELT4_SWITCH_R: return GFX_BELT4_SWITCH_R; + case EL_BELT4_SWITCH_LEFT: return GFX_BELT4_SWITCH_LEFT; + case EL_BELT4_SWITCH_MIDDLE:return GFX_BELT4_SWITCH_MIDDLE; + case EL_BELT4_SWITCH_RIGHT: return GFX_BELT4_SWITCH_RIGHT; case EL_LANDMINE: return GFX_LANDMINE; case EL_ENVELOPE: return GFX_ENVELOPE; case EL_LIGHT_SWITCH_OFF: return GFX_LIGHT_SWITCH_OFF; @@ -2561,8 +2592,28 @@ int el2gfx(int element) case EL_SAND_INVISIBLE: return GFX_SAND_INVISIBLE; case EL_DX_UNKNOWN_15: return GFX_DX_UNKNOWN_15; case EL_DX_UNKNOWN_42: return GFX_DX_UNKNOWN_42; - case EL_DX_UNKNOWN_229: return GFX_DX_UNKNOWN_229; - case EL_DX_UNKNOWN_233: return GFX_DX_UNKNOWN_233; + case EL_TIMEGATE_OPEN: return GFX_TIMEGATE_OPEN; + case EL_TIMEGATE_CLOSED: return GFX_TIMEGATE_CLOSED; + case EL_TIMEGATE_SWITCH_ON: return GFX_TIMEGATE_SWITCH; + case EL_TIMEGATE_SWITCH_OFF:return GFX_TIMEGATE_SWITCH; + case EL_BALLOON: return GFX_BALLOON; + case EL_BALLOON_SEND_LEFT: return GFX_BALLOON_SEND_LEFT; + case EL_BALLOON_SEND_RIGHT: return GFX_BALLOON_SEND_RIGHT; + case EL_BALLOON_SEND_UP: return GFX_BALLOON_SEND_UP; + case EL_BALLOON_SEND_DOWN: return GFX_BALLOON_SEND_DOWN; + case EL_BALLOON_SEND_ANY: return GFX_BALLOON_SEND_ANY; + case EL_EMC_STEEL_WALL_1: return GFX_EMC_STEEL_WALL_1; + case EL_EMC_STEEL_WALL_2: return GFX_EMC_STEEL_WALL_2; + case EL_EMC_STEEL_WALL_3: return GFX_EMC_STEEL_WALL_3; + case EL_EMC_STEEL_WALL_4: return GFX_EMC_STEEL_WALL_4; + case EL_EMC_WALL_1: return GFX_EMC_WALL_1; + case EL_EMC_WALL_2: return GFX_EMC_WALL_2; + case EL_EMC_WALL_3: return GFX_EMC_WALL_3; + case EL_EMC_WALL_4: return GFX_EMC_WALL_4; + case EL_EMC_WALL_5: return GFX_EMC_WALL_5; + case EL_EMC_WALL_6: return GFX_EMC_WALL_6; + case EL_EMC_WALL_7: return GFX_EMC_WALL_7; + case EL_EMC_WALL_8: return GFX_EMC_WALL_8; default: {