From: Holger Schemel Date: Sat, 23 Oct 1999 18:15:19 +0000 (+0200) Subject: rnd-19991023-2-src X-Git-Tag: 1.4.0^2~3 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=f8f7840ddc57a2c31a3d6ab664b0e4e7e7ad69ce;p=rocksndiamonds.git rnd-19991023-2-src --- diff --git a/src/editor.c b/src/editor.c index 212de031..91e10699 100644 --- a/src/editor.c +++ b/src/editor.c @@ -752,7 +752,7 @@ int editor_element[] = EL_BETON, EL_BD_WALL, - EL_SIEB2_INAKTIV, + EL_MAGIC_WALL_BD_OFF, EL_AUSGANG_ZU, EL_AUSGANG_AUF, @@ -799,7 +799,7 @@ int editor_element[] = EL_BETON, EL_MAUERWERK, EL_FELSBODEN, - EL_SIEB_INAKTIV, + EL_MAGIC_WALL_OFF, EL_EDELSTEIN, EL_DIAMANT, @@ -2626,7 +2626,7 @@ static void DrawPropertiesWindow() { EL_AMOEBE_NORM, &level.amoeba_speed, TEXT_SPEED }, { EL_AMOEBE_VOLL, &level.amoeba_speed, TEXT_SPEED }, { EL_AMOEBE_BD, &level.amoeba_speed, TEXT_SPEED }, - { EL_SIEB_INAKTIV, &level.time_magic_wall, TEXT_DURATION }, + { EL_MAGIC_WALL_OFF,&level.time_magic_wall, TEXT_DURATION }, { EL_ABLENK_AUS, &level.time_wheel, TEXT_DURATION }, { -1, NULL, NULL } }; diff --git a/src/game.c b/src/game.c index c75171ba..93c23dc2 100644 --- a/src/game.c +++ b/src/game.c @@ -1160,8 +1160,8 @@ void RemoveMovingField(int x, int y) if (Feld[x][y] == EL_BLOCKED && (Store[oldx][oldy] == EL_MORAST_LEER || - Store[oldx][oldy] == EL_SIEB_LEER || - Store[oldx][oldy] == EL_SIEB2_LEER || + Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY || + Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY || Store[oldx][oldy] == EL_AMOEBE_NASS)) { Feld[oldx][oldy] = Store[oldx][oldy]; @@ -1804,11 +1804,12 @@ void Impact(int x, int y) if (!lastline && object_hit) /* check which object was hit */ { if (CAN_CHANGE(element) && - (smashed == EL_SIEB_INAKTIV || smashed == EL_SIEB2_INAKTIV)) + (smashed == EL_MAGIC_WALL_OFF || smashed == EL_MAGIC_WALL_BD_OFF)) { int x, y; int activated_magic_wall = - (smashed == EL_SIEB_INAKTIV ? EL_SIEB_LEER : EL_SIEB2_LEER); + (smashed == EL_MAGIC_WALL_OFF ? EL_MAGIC_WALL_EMPTY : + EL_MAGIC_WALL_BD_EMPTY); /* activate magic wall / mill */ @@ -1898,7 +1899,8 @@ void Impact(int x, int y) /* play sound of magic wall / mill */ if (!lastline && - (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER)) + (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY || + Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)) { PlaySoundLevel(x, y, SND_QUIRK); return; @@ -2440,15 +2442,15 @@ void StartMoving(int x, int y) InitMovingField(x, y, MV_DOWN); Store[x][y] = EL_MORAST_VOLL; } - else if (element == EL_SIEB_VOLL) + else if (element == EL_MAGIC_WALL_FULL) { if (IS_FREE(x, y+1)) { InitMovingField(x, y, MV_DOWN); Feld[x][y] = EL_CHANGED(Store2[x][y]); - Store[x][y] = EL_SIEB_LEER; + Store[x][y] = EL_MAGIC_WALL_EMPTY; } - else if (Feld[x][y+1] == EL_SIEB_LEER) + else if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY/4 + 1; @@ -2460,21 +2462,21 @@ void StartMoving(int x, int y) return; } - Feld[x][y] = EL_SIEB_LEER; - Feld[x][y+1] = EL_SIEB_VOLL; + Feld[x][y] = EL_MAGIC_WALL_EMPTY; + Feld[x][y+1] = EL_MAGIC_WALL_FULL; Store2[x][y+1] = EL_CHANGED(Store2[x][y]); Store2[x][y] = 0; } } - else if (element == EL_SIEB2_VOLL) + else if (element == EL_MAGIC_WALL_BD_FULL) { if (IS_FREE(x, y+1)) { InitMovingField(x, y, MV_DOWN); Feld[x][y] = EL_CHANGED2(Store2[x][y]); - Store[x][y] = EL_SIEB2_LEER; + Store[x][y] = EL_MAGIC_WALL_BD_EMPTY; } - else if (Feld[x][y+1] == EL_SIEB2_LEER) + else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY/4 + 1; @@ -2486,18 +2488,20 @@ void StartMoving(int x, int y) return; } - Feld[x][y] = EL_SIEB2_LEER; - Feld[x][y+1] = EL_SIEB2_VOLL; + Feld[x][y] = EL_MAGIC_WALL_BD_EMPTY; + Feld[x][y+1] = EL_MAGIC_WALL_BD_FULL; Store2[x][y+1] = EL_CHANGED2(Store2[x][y]); Store2[x][y] = 0; } } else if (CAN_CHANGE(element) && - (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER)) + (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY || + Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)) { InitMovingField(x, y, MV_DOWN); Store[x][y] = - (Feld[x][y+1] == EL_SIEB_LEER ? EL_SIEB_VOLL : EL_SIEB2_VOLL); + (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FULL : + EL_MAGIC_WALL_BD_FULL); Store2[x][y+1] = element; } else if (CAN_SMASH(element) && Feld[x][y+1] == EL_SALZSAEURE) @@ -2941,27 +2945,30 @@ void ContinueMoving(int x, int y) Store[x][y] = 0; Feld[x][y] = EL_MORAST_LEER; } - else if (Store[x][y] == EL_SIEB_VOLL) + else if (Store[x][y] == EL_MAGIC_WALL_FULL) { Store[x][y] = 0; element = Feld[newx][newy] = - (game.magic_wall_active ? EL_SIEB_VOLL : EL_SIEB_TOT); + (game.magic_wall_active ? EL_MAGIC_WALL_FULL : EL_MAGIC_WALL_DEAD); } - else if (Store[x][y] == EL_SIEB_LEER) + else if (Store[x][y] == EL_MAGIC_WALL_EMPTY) { Store[x][y] = Store2[x][y] = 0; - Feld[x][y] = (game.magic_wall_active ? EL_SIEB_LEER : EL_SIEB_TOT); + Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_EMPTY : + EL_MAGIC_WALL_DEAD); } - else if (Store[x][y] == EL_SIEB2_VOLL) + else if (Store[x][y] == EL_MAGIC_WALL_BD_FULL) { Store[x][y] = 0; element = Feld[newx][newy] = - (game.magic_wall_active ? EL_SIEB2_VOLL : EL_SIEB2_TOT); + (game.magic_wall_active ? EL_MAGIC_WALL_BD_FULL : + EL_MAGIC_WALL_BD_DEAD); } - else if (Store[x][y] == EL_SIEB2_LEER) + else if (Store[x][y] == EL_MAGIC_WALL_BD_EMPTY) { Store[x][y] = Store2[x][y] = 0; - Feld[x][y] = (game.magic_wall_active ? EL_SIEB2_LEER : EL_SIEB2_TOT); + Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_BD_EMPTY : + EL_MAGIC_WALL_BD_DEAD); } else if (Store[x][y] == EL_SALZSAEURE) { @@ -3575,7 +3582,7 @@ void BreakingPearl(int x, int y) void SiebAktivieren(int x, int y, int typ) { - int graphic = (typ == 1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL) + 3; + int graphic = (typ == 1 ? GFX_MAGIC_WALL_FULL : GFX_MAGIC_WALL_BD_FULL) + 3; DrawGraphicAnimation(x, y, graphic, 4, 4, ANIM_REVERSE); } @@ -4422,14 +4429,15 @@ void GameActions() boolean sieb = FALSE; int jx = local_player->jx, jy = local_player->jy; - if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL || - Store[x][y] == EL_SIEB_LEER) + if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL || + Store[x][y] == EL_MAGIC_WALL_EMPTY) { SiebAktivieren(x, y, 1); sieb = TRUE; } - else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL || - Store[x][y] == EL_SIEB2_LEER) + else if (element == EL_MAGIC_WALL_BD_EMPTY || + element == EL_MAGIC_WALL_BD_FULL || + Store[x][y] == EL_MAGIC_WALL_BD_EMPTY) { SiebAktivieren(x, y, 2); sieb = TRUE; @@ -4458,14 +4466,15 @@ void GameActions() { element = Feld[x][y]; - if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL) + if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL) { - Feld[x][y] = EL_SIEB_TOT; + Feld[x][y] = EL_MAGIC_WALL_DEAD; DrawLevelField(x, y); } - else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL) + else if (element == EL_MAGIC_WALL_BD_EMPTY || + element == EL_MAGIC_WALL_BD_FULL) { - Feld[x][y] = EL_SIEB2_TOT; + Feld[x][y] = EL_MAGIC_WALL_BD_DEAD; DrawLevelField(x, y); } } diff --git a/src/init.c b/src/init.c index 6276e5bc..7f5a4aea 100644 --- a/src/init.c +++ b/src/init.c @@ -910,14 +910,14 @@ void InitElementProperties() EL_AMOEBE_BD, EL_MORAST_VOLL, EL_MORAST_LEER, - EL_SIEB_INAKTIV, - EL_SIEB_LEER, - EL_SIEB_VOLL, - EL_SIEB_TOT, - EL_SIEB2_INAKTIV, - EL_SIEB2_LEER, - EL_SIEB2_VOLL, - EL_SIEB2_TOT, + EL_MAGIC_WALL_OFF, + EL_MAGIC_WALL_EMPTY, + EL_MAGIC_WALL_FULL, + EL_MAGIC_WALL_DEAD, + EL_MAGIC_WALL_BD_OFF, + EL_MAGIC_WALL_BD_EMPTY, + EL_MAGIC_WALL_BD_FULL, + EL_MAGIC_WALL_BD_DEAD, EL_LIFE, EL_LIFE_ASYNC, EL_BADEWANNE1, @@ -1222,8 +1222,8 @@ void InitElementProperties() EL_KOKOSNUSS, EL_TROPFEN, EL_MORAST_VOLL, - EL_SIEB_VOLL, - EL_SIEB2_VOLL, + EL_MAGIC_WALL_FULL, + EL_MAGIC_WALL_BD_FULL, EL_ZEIT_VOLL, EL_ZEIT_LEER, EL_SP_ZONK, @@ -1394,7 +1394,7 @@ void InitElementProperties() EL_FELSBROCKEN, EL_BD_ROCK, EL_EDELSTEIN_BD, - EL_SIEB2_INAKTIV, + EL_MAGIC_WALL_BD_OFF, EL_AUSGANG_ZU, EL_AUSGANG_AUF, EL_BETON, @@ -1496,10 +1496,10 @@ void InitElementProperties() EL_BADEWANNE3, EL_BADEWANNE4, EL_BADEWANNE5, - EL_SIEB_INAKTIV, - EL_SIEB_TOT, - EL_SIEB2_INAKTIV, - EL_SIEB2_TOT, + EL_MAGIC_WALL_OFF, + EL_MAGIC_WALL_DEAD, + EL_MAGIC_WALL_BD_OFF, + EL_MAGIC_WALL_BD_DEAD, EL_AMOEBA2DIAM, EL_BLOCKED, EL_SP_EMPTY, diff --git a/src/main.h b/src/main.h index 716ce292..3753f1a8 100644 --- a/src/main.h +++ b/src/main.h @@ -661,7 +661,7 @@ extern char *element_info[]; #define EL_MORAST_VOLL 17 #define EL_TROPFEN 18 #define EL_BOMBE 19 -#define EL_SIEB_INAKTIV 20 +#define EL_MAGIC_WALL_OFF 20 #define EL_SPEED_PILL 21 #define EL_SALZSAEURE 22 #define EL_AMOEBE_NASS 23 @@ -702,7 +702,7 @@ extern char *element_info[]; #define EL_ERZ_EDEL_BD 58 #define EL_ERZ_EDEL_GELB 59 #define EL_MAMPFER2 60 -#define EL_SIEB2_INAKTIV 61 +#define EL_MAGIC_WALL_BD_OFF 61 #define EL_INVISIBLE_STEEL 62 #define EL_UNUSED_63 63 @@ -989,12 +989,12 @@ extern char *element_info[]; /* "real" (and therefore drawable) runtime elements */ #define EL_FIRST_RUNTIME_EL 500 -#define EL_SIEB_LEER 500 -#define EL_SIEB2_LEER 501 -#define EL_SIEB_VOLL 502 -#define EL_SIEB2_VOLL 503 -#define EL_SIEB_TOT 504 -#define EL_SIEB2_TOT 505 +#define EL_MAGIC_WALL_EMPTY 500 +#define EL_MAGIC_WALL_BD_EMPTY 501 +#define EL_MAGIC_WALL_FULL 502 +#define EL_MAGIC_WALL_BD_FULL 503 +#define EL_MAGIC_WALL_DEAD 504 +#define EL_MAGIC_WALL_BD_DEAD 505 #define EL_AUSGANG_ACT 506 #define EL_SP_TERMINAL_ACTIVE 507 #define EL_SP_BUG_ACTIVE 508 @@ -1145,10 +1145,10 @@ extern char *element_info[]; #define GFX_SOKOBAN_FELD_VOLL 123 #define GFX_GEBLUBBER 124 /* Zeile 8 (128) */ -#define GFX_SIEB_INAKTIV 128 -#define GFX_SIEB_LEER GFX_SIEB_INAKTIV -#define GFX_SIEB_VOLL GFX_SIEB_INAKTIV -#define GFX_SIEB_TOT GFX_SIEB_INAKTIV +#define GFX_MAGIC_WALL_OFF 128 +#define GFX_MAGIC_WALL_EMPTY GFX_MAGIC_WALL_OFF +#define GFX_MAGIC_WALL_FULL GFX_MAGIC_WALL_OFF +#define GFX_MAGIC_WALL_DEAD GFX_MAGIC_WALL_OFF #define GFX_ERZ_EDEL 132 #define GFX_ERZ_DIAM 133 #define GFX_ERZ_EDEL_ROT 134 @@ -1183,10 +1183,10 @@ extern char *element_info[]; #define GFX_MAUER_L1 GFX_MAUER_LEFT #define GFX_MAUER_L 170 #define GFX_MAUER_LEBT 171 -#define GFX_SIEB2_INAKTIV 172 -#define GFX_SIEB2_LEER GFX_SIEB2_INAKTIV -#define GFX_SIEB2_VOLL GFX_SIEB2_INAKTIV -#define GFX_SIEB2_TOT GFX_SIEB2_INAKTIV +#define GFX_MAGIC_WALL_BD_OFF 172 +#define GFX_MAGIC_WALL_BD_EMPTY GFX_MAGIC_WALL_BD_OFF +#define GFX_MAGIC_WALL_BD_FULL GFX_MAGIC_WALL_BD_OFF +#define GFX_MAGIC_WALL_BD_DEAD GFX_MAGIC_WALL_BD_OFF /* Zeile 11 (176) */ #define GFX_AUSGANG_ZU 176 #define GFX_AUSGANG_ACT 177 diff --git a/src/screens.c b/src/screens.c index abe7925a..f2335cac 100644 --- a/src/screens.c +++ b/src/screens.c @@ -472,8 +472,8 @@ static int helpscreen_action[] = GFX_DIAMANT,1,10, HA_NEXT, GFX_LIFE,1,100, HA_NEXT, GFX_LIFE_ASYNC,1,100, HA_NEXT, - GFX_SIEB_INAKTIV,4,2, HA_NEXT, - GFX_SIEB2_INAKTIV,4,2, HA_NEXT, + GFX_MAGIC_WALL_OFF,4,2, HA_NEXT, + GFX_MAGIC_WALL_BD_OFF,4,2, HA_NEXT, GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2, GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2, GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2, HA_NEXT, diff --git a/src/tools.c b/src/tools.c index dbd8c5d5..e77bf124 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1196,8 +1196,10 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, graphic += phase2; } } - else if (element == EL_SIEB_LEER || element == EL_SIEB2_LEER || - element == EL_SIEB_VOLL || element == EL_SIEB2_VOLL) + else if (element == EL_MAGIC_WALL_EMPTY || + element == EL_MAGIC_WALL_BD_EMPTY || + element == EL_MAGIC_WALL_FULL || + element == EL_MAGIC_WALL_BD_FULL) { graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE); } @@ -1425,13 +1427,13 @@ void DrawScreenField(int x, int y) boolean cut_mode = NO_CUTTING; if (Store[ux][uy] == EL_MORAST_LEER || - Store[ux][uy] == EL_SIEB_LEER || - Store[ux][uy] == EL_SIEB2_LEER || + Store[ux][uy] == EL_MAGIC_WALL_EMPTY || + Store[ux][uy] == EL_MAGIC_WALL_BD_EMPTY || Store[ux][uy] == EL_AMOEBE_NASS) cut_mode = CUT_ABOVE; else if (Store[ux][uy] == EL_MORAST_VOLL || - Store[ux][uy] == EL_SIEB_VOLL || - Store[ux][uy] == EL_SIEB2_VOLL) + Store[ux][uy] == EL_MAGIC_WALL_FULL || + Store[ux][uy] == EL_MAGIC_WALL_BD_FULL) cut_mode = CUT_BELOW; if (cut_mode == CUT_ABOVE) @@ -1461,8 +1463,8 @@ void DrawScreenField(int x, int y) MovDir[oldx][oldy] == MV_RIGHT); if (Store[oldx][oldy] == EL_MORAST_LEER || - Store[oldx][oldy] == EL_SIEB_LEER || - Store[oldx][oldy] == EL_SIEB2_LEER || + Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY || + Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY || Store[oldx][oldy] == EL_AMOEBE_NASS) cut_mode = CUT_ABOVE; @@ -2455,10 +2457,10 @@ int el2gfx(int element) case EL_MORAST_VOLL: return GFX_MORAST_VOLL; case EL_TROPFEN: return GFX_TROPFEN; case EL_BOMBE: return GFX_BOMBE; - case EL_SIEB_INAKTIV: return GFX_SIEB_INAKTIV; - case EL_SIEB_LEER: return GFX_SIEB_LEER; - case EL_SIEB_VOLL: return GFX_SIEB_VOLL; - case EL_SIEB_TOT: return GFX_SIEB_TOT; + case EL_MAGIC_WALL_OFF: return GFX_MAGIC_WALL_OFF; + case EL_MAGIC_WALL_EMPTY: return GFX_MAGIC_WALL_EMPTY; + case EL_MAGIC_WALL_FULL: return GFX_MAGIC_WALL_FULL; + case EL_MAGIC_WALL_DEAD: return GFX_MAGIC_WALL_DEAD; case EL_SALZSAEURE: return GFX_SALZSAEURE; case EL_AMOEBE_TOT: return GFX_AMOEBE_TOT; case EL_AMOEBE_NASS: return GFX_AMOEBE_NASS; @@ -2516,10 +2518,10 @@ int el2gfx(int element) case EL_ERZ_EDEL_ROT: return GFX_ERZ_EDEL_ROT; case EL_ERZ_EDEL_LILA: return GFX_ERZ_EDEL_LILA; case EL_MAMPFER2: return GFX_MAMPFER2; - case EL_SIEB2_INAKTIV: return GFX_SIEB2_INAKTIV; - case EL_SIEB2_LEER: return GFX_SIEB2_LEER; - case EL_SIEB2_VOLL: return GFX_SIEB2_VOLL; - case EL_SIEB2_TOT: return GFX_SIEB2_TOT; + case EL_MAGIC_WALL_BD_OFF: return GFX_MAGIC_WALL_BD_OFF; + case EL_MAGIC_WALL_BD_EMPTY:return GFX_MAGIC_WALL_BD_EMPTY; + case EL_MAGIC_WALL_BD_FULL: return GFX_MAGIC_WALL_BD_FULL; + case EL_MAGIC_WALL_BD_DEAD: return GFX_MAGIC_WALL_BD_DEAD; case EL_DYNABOMB_ACTIVE_1: return GFX_DYNABOMB; case EL_DYNABOMB_ACTIVE_2: return GFX_DYNABOMB; case EL_DYNABOMB_ACTIVE_3: return GFX_DYNABOMB;