#include "init.h"
#include "files.h"
#include "tape.h"
-#include "joystick.h"
#include "network.h"
/* this switch controls how rocks move horizontally */
#define OLD_GAME_BEHAVIOUR FALSE
+/* EXPERIMENTAL STUFF */
+#define USE_NEW_AMOEBA_CODE FALSE
+
/* for DigField() */
#define DF_NO_PUSH 0
#define DF_DIG 1
#define DX_TIME (DX + XX_TIME)
#define DY_TIME (DY + YY_TIME)
-#define IS_LOOP_SOUND(s) ((s)==SND_KLAPPER || (s)==SND_ROEHR || \
- (s)==SND_NJAM || (s)==SND_MIEP)
-#define IS_MUSIC_SOUND(s) ((s)==SND_ALCHEMY || (s)==SND_CHASE || \
- (s)==SND_NETWORK || (s)==SND_CZARDASZ || \
- (s)==SND_TYGER || (s)==SND_VOYAGER || \
- (s)==SND_TWILIGHT)
+#if 0
+#define IS_LOOP_SOUND(s) ((s) == SND_BD_MAGIC_WALL_RUNNING || \
+ (s) == SND_BD_BUTTERFLY_MOVING || \
+ (s) == SND_BD_FIREFLY_MOVING || \
+ (s) == SND_SP_SNIKSNAK_MOVING || \
+ (s) == SND_SP_ELECTRON_MOVING || \
+ (s) == SND_DYNAMITE_BURNING || \
+ (s) == SND_BUG_MOVING || \
+ (s) == SND_SPACESHIP_MOVING || \
+ (s) == SND_YAMYAM_MOVING || \
+ (s) == SND_YAMYAM_WAITING || \
+ (s) == SND_ROBOT_WHEEL_RUNNING || \
+ (s) == SND_MAGIC_WALL_RUNNING || \
+ (s) == SND_BALLOON_MOVING || \
+ (s) == SND_MOLE_MOVING || \
+ (s) == SND_TIMEGATE_WHEEL_RUNNING || \
+ (s) == SND_CONVEYOR_BELT_RUNNING || \
+ (s) == SND_DYNABOMB_BURNING || \
+ (s) == SND_PACMAN_MOVING || \
+ (s) == SND_PENGUIN_MOVING || \
+ (s) == SND_PIG_MOVING || \
+ (s) == SND_DRAGON_MOVING || \
+ (s) == SND_DRAGON_BREATHING_FIRE)
+#endif
/* values for player movement speed (which is in fact a delay value) */
#define MOVE_DELAY_NORMAL_SPEED 8
static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS];
+static boolean is_loop_sound[NUM_SOUND_EFFECTS];
+static boolean is_loop_sound_initialized = FALSE;
+static int loop_sounds[] =
+{
+ SND_BD_MAGIC_WALL_RUNNING,
+ SND_BD_BUTTERFLY_MOVING,
+ SND_BD_FIREFLY_MOVING,
+ SND_SP_SNIKSNAK_MOVING,
+ SND_SP_ELECTRON_MOVING,
+ SND_DYNAMITE_BURNING,
+ SND_BUG_MOVING,
+ SND_SPACESHIP_MOVING,
+ SND_YAMYAM_MOVING,
+ SND_YAMYAM_WAITING,
+ SND_ROBOT_WHEEL_RUNNING,
+ SND_MAGIC_WALL_RUNNING,
+ SND_BALLOON_MOVING,
+ SND_MOLE_MOVING,
+ SND_TIMEGATE_WHEEL_RUNNING,
+ SND_CONVEYOR_BELT_RUNNING,
+ SND_DYNABOMB_BURNING,
+ SND_PACMAN_MOVING,
+ SND_PENGUIN_MOVING,
+ SND_PIG_MOVING,
+ SND_DRAGON_MOVING,
+ SND_DRAGON_BREATHING_FIRE
+};
+
+#define IS_LOOP_SOUND(x) (is_loop_sound[x])
+
#ifdef DEBUG
setup.sound = FALSE;
if (!audio.loops_available)
- {
setup.sound_loops = FALSE;
+
+ if (!audio.music_available)
setup.sound_music = FALSE;
- }
if (!video.fullscreen_available)
setup.fullscreen = FALSE;
StorePlayer[x][y] = Feld[x][y];
- if (options.verbose)
+ if (options.debug)
{
printf("Player %d activated.\n", player->element_nr);
printf("[Local player is %d and currently %s.]\n",
}
}
+void DrawGameDoorValues()
+{
+ int i, j;
+
+ for (i=0; i<MAX_PLAYERS; i++)
+ for (j=0; j<4; j++)
+ if (stored_player[i].key[j])
+ DrawMiniGraphicExt(drawto, DX_KEYS + j * MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1 + j);
+
+ DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
+ int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW);
+ DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
+ int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
+ DrawText(DX + XX_SCORE, DY + YY_SCORE,
+ int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
+ DrawText(DX + XX_TIME, DY + YY_TIME,
+ int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+}
+
void InitGame()
{
int i, j, x, y;
boolean emulate_sb = TRUE; /* unless non-SOKOBAN elements found */
boolean emulate_sp = TRUE; /* unless non-SUPAPLEX elements found */
+#if DEBUG
+#if USE_NEW_AMOEBA_CODE
+ printf("Using new amoeba code.\n");
+#else
+ printf("Using old amoeba code.\n");
+#endif
+#endif
+
/* don't play tapes over network */
network_playing = (options.network && !tape.playing);
player->frame_reset_delay = 0;
- player->push_delay = 0;
- player->push_delay_value = 5;
-
- player->move_delay = 0;
player->last_move_dir = MV_NO_MOVING;
+ player->is_moving = FALSE;
+ player->move_delay = -1; /* no initial move delay */
player->move_delay_value =
(level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED);
+ player->push_delay = 0;
+ player->push_delay_value = 5;
+
player->snapped = FALSE;
player->last_jx = player->last_jy = 0;
tape.player_participates[i] = TRUE;
}
- if (options.verbose)
+ if (options.debug)
{
for (i=0; i<MAX_PLAYERS; i++)
{
}
}
+ /* initialize sound effect properties */
+ if (!is_loop_sound_initialized)
+ {
+ int i;
+
+ for (i=0; i<NUM_SOUND_EFFECTS; i++)
+ is_loop_sound[i] = FALSE;
+
+ for (i=0; i<SIZEOF_ARRAY_INT(loop_sounds); i++)
+ is_loop_sound[loop_sounds[i]] = TRUE;
+
+ is_loop_sound_initialized = TRUE;
+ }
+
game.version = (tape.playing ? tape.game_version : level.game_version);
game.emulation = (emulate_bd ? EMU_BOULDERDASH :
emulate_sb ? EMU_SOKOBAN :
/* dynamically adjust element properties according to game engine version */
{
- static int ep_slippery[] =
+ static int ep_em_slippery_wall[] =
{
EL_BETON,
EL_MAUERWERK,
EL_MAUER_Y,
EL_MAUER_XY
};
- static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+#if 1
+ static int ep_em_slippery_wall_num = SIZEOF_ARRAY_INT(ep_em_slippery_wall);
+#else
+ static int ep_em_slippery_wall_num =
+ sizeof(ep_em_slippery_wall) / sizeof(int);
+#endif
- for (i=0; i<ep_slippery_num; i++)
+ /*
+ printf("level %d: game.version == %06d\n", level_nr, level.game_version);
+ printf(" file_version == %06d\n", level.file_version);
+ */
+
+ for (i=0; i<ep_em_slippery_wall_num; i++)
{
+#if 1
+ if (level.em_slippery_gems) /* special EM style gems behaviour */
+#else
if (game.version >= GAME_VERSION_2_0)
- Elementeigenschaften1[ep_slippery[i]] |= EP_BIT_SLIPPERY;
+#endif
+ Elementeigenschaften2[ep_em_slippery_wall[i]] |=
+ EP_BIT_EM_SLIPPERY_WALL;
else
- Elementeigenschaften1[ep_slippery[i]] &= ~EP_BIT_SLIPPERY;
+ Elementeigenschaften2[ep_em_slippery_wall[i]] &=
+ ~EP_BIT_EM_SLIPPERY_WALL;
}
}
DX + XX_LEVEL - 1, DY + YY_LEVEL + 1);
}
- DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
- int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW);
- DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
- int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
- DrawText(DX + XX_SCORE, DY + YY_SCORE,
- int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
- DrawText(DX + XX_TIME, DY + YY_TIME,
- int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+ DrawGameDoorValues();
UnmapGameButtons();
+ UnmapTapeButtons();
game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music;
game_gadget[SOUND_CTRL_ID_LOOPS]->checked = setup.sound_loops;
game_gadget[SOUND_CTRL_ID_SIMPLE]->checked = setup.sound_simple;
OpenDoor(DOOR_OPEN_ALL);
- if (setup.sound_music && num_bg_loops)
- PlayMusic(level_nr % num_bg_loops);
+ PlaySoundStereo(SND_GAME_STARTING, PSND_MAX_RIGHT);
+ if (setup.sound_music)
+ PlayMusic(level_nr);
KeyboardAutoRepeatOff();
- if (options.verbose)
+ if (options.debug)
{
for (i=0; i<4; i++)
printf("Player %d %sactive.\n",
local_player->LevelSolved = FALSE;
+ PlaySoundStereo(SND_GAME_WINNING, PSND_MAX_RIGHT);
+
if (TimeLeft)
{
- if (setup.sound_loops)
- PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
+ if (!tape.playing && setup.sound_loops)
+ PlaySoundExt(SND_GAME_LEVELTIME_BONUS, PSND_MAX_VOLUME, PSND_MAX_RIGHT,
+ SND_CTRL_PLAY_LOOP);
- while(TimeLeft > 0)
+ while (TimeLeft > 0)
{
- if (!setup.sound_loops)
- PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
+ if (!tape.playing && !setup.sound_loops)
+ PlaySoundStereo(SND_GAME_LEVELTIME_BONUS, PSND_MAX_RIGHT);
if (TimeLeft > 0 && !(TimeLeft % 10))
RaiseScore(level.score[SC_ZEITBONUS]);
if (TimeLeft > 100 && !(TimeLeft % 10))
TimeLeft--;
DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
BackToFront();
- Delay(10);
+
+ if (!tape.playing)
+ Delay(10);
}
- if (setup.sound_loops)
- StopSound(SND_SIRR);
+ if (!tape.playing && setup.sound_loops)
+ StopSound(SND_GAME_LEVELTIME_BONUS);
}
else if (level.time == 0) /* level without time limit */
{
- if (setup.sound_loops)
- PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
+ if (!tape.playing && setup.sound_loops)
+ PlaySoundExt(SND_GAME_LEVELTIME_BONUS, PSND_MAX_VOLUME, PSND_MAX_RIGHT,
+ SND_CTRL_PLAY_LOOP);
- while(TimePlayed < 999)
+ while (TimePlayed < 999)
{
- if (!setup.sound_loops)
- PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
+ if (!tape.playing && !setup.sound_loops)
+ PlaySoundStereo(SND_GAME_LEVELTIME_BONUS, PSND_MAX_RIGHT);
if (TimePlayed < 999 && !(TimePlayed % 10))
RaiseScore(level.score[SC_ZEITBONUS]);
if (TimePlayed < 900 && !(TimePlayed % 10))
TimePlayed++;
DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
BackToFront();
- Delay(10);
+
+ if (!tape.playing)
+ Delay(10);
}
- if (setup.sound_loops)
- StopSound(SND_SIRR);
+ if (!tape.playing && setup.sound_loops)
+ StopSound(SND_GAME_LEVELTIME_BONUS);
}
#if 0
game_status = HALLOFFAME;
DrawHallOfFame(hi_pos);
if (raise_level)
+ {
level_nr++;
+ TapeErase();
+ }
}
else
{
game_status = MAINMENU;
if (raise_level)
+ {
level_nr++;
+ TapeErase();
+ }
DrawMainMenu();
}
if (MovDelay[x][y])
{
if (!(MovDelay[x][y] % 12))
- PlaySoundLevel(x, y, SND_ZISCH);
+ {
+ if (Feld[x][y] == EL_DYNAMITE_ACTIVE)
+ PlaySoundLevel(x, y, SND_DYNAMITE_BURNING);
+ else
+ PlaySoundLevel(x, y, SND_DYNABOMB_BURNING);
+ }
if (IS_ACTIVE_BOMB(Feld[x][y]))
{
}
}
- StopSound(SND_ZISCH);
+ if (Feld[x][y] == EL_DYNAMITE_ACTIVE)
+ StopSound(SND_DYNAMITE_BURNING);
+ else
+ StopSound(SND_DYNABOMB_BURNING);
+
Bang(x, y);
}
void Explode(int ex, int ey, int phase, int mode)
{
int x, y;
- int num_phase = 9, delay = 2;
+ int num_phase = 9, delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
int last_phase = num_phase * delay;
int half_phase = (num_phase / 2) * delay;
int first_phase_after_start = EX_PHASE_START + 1;
if (CAN_MOVE(element) || COULD_MOVE(element))
InitMovDir(x, y);
DrawLevelField(x, y);
+
+ if (IS_PLAYER(x, y) && !PLAYERINFO(x,y)->present)
+ StorePlayer[x][y] = 0;
}
else if (!(phase % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
{
if (phase == delay)
ErdreichAnbroeckeln(SCREENX(x), SCREENY(y));
- DrawGraphic(SCREENX(x), SCREENY(y), graphic + (phase / delay - 1));
+ graphic += (phase / delay - 1);
+
+ if (IS_PFORTE(Store[x][y]))
+ {
+ DrawLevelElement(x, y, Store[x][y]);
+ DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic);
+ }
+ else
+ DrawGraphic(SCREENX(x), SCREENY(y), graphic);
}
}
int element = Feld[x][y];
if (game.emulation == EMU_SUPAPLEX)
- PlaySoundLevel(x, y, SND_SP_BOOOM);
+ PlaySoundLevel(x, y, SND_SP_ELEMENT_EXPLODING);
else
- PlaySoundLevel(x, y, SND_ROAAAR);
+ PlaySoundLevel(x, y, SND_ELEMENT_EXPLODING);
#if 0
if (IS_PLAYER(x, y)) /* remove objects that might cause smaller explosion */
if (element != EL_BLURB_LEFT && element != EL_BLURB_RIGHT) /* start */
{
- PlaySoundLevel(x, y, SND_BLURB);
+ PlaySoundLevel(x, y, SND_ACID_SPLASHING);
if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) &&
(!IN_LEV_FIELD(x-1, y-1) ||
!CAN_FALL(MovingOrBlocked2Element(x-1, y-1))))
element == EL_SWITCHGATE_OPENING)
{
Feld[xx][yy] = EL_SWITCHGATE_CLOSING;
- PlaySoundLevel(xx, yy, SND_OEFFNEN);
+ PlaySoundLevel(xx, yy, SND_SWITCHGATE_CLOSING);
}
else if (element == EL_SWITCHGATE_CLOSED ||
element == EL_SWITCHGATE_CLOSING)
{
Feld[xx][yy] = EL_SWITCHGATE_OPENING;
- PlaySoundLevel(xx, yy, SND_OEFFNEN);
+ PlaySoundLevel(xx, yy, SND_SWITCHGATE_OPENING);
}
}
}
element == EL_TIMEGATE_CLOSING)
{
Feld[xx][yy] = EL_TIMEGATE_OPENING;
- PlaySoundLevel(xx, yy, SND_OEFFNEN);
+ PlaySoundLevel(xx, yy, SND_TIMEGATE_OPENING);
}
/*
else if (element == EL_PEARL)
{
Feld[x][y] = EL_PEARL_BREAKING;
- PlaySoundLevel(x, y, SND_KNACK);
+ PlaySoundLevel(x, y, SND_PEARL_BREAKING);
return;
}
if (CAN_CHANGE(element) &&
(smashed == EL_MAGIC_WALL_OFF || smashed == EL_MAGIC_WALL_BD_OFF))
{
- int x, y;
+ int xx, yy;
int activated_magic_wall =
(smashed == EL_MAGIC_WALL_OFF ? EL_MAGIC_WALL_EMPTY :
EL_MAGIC_WALL_BD_EMPTY);
/* activate magic wall / mill */
-
- for (y=0; y<lev_fieldy; y++)
- for (x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == smashed)
- Feld[x][y] = activated_magic_wall;
+ for (yy=0; yy<lev_fieldy; yy++)
+ for (xx=0; xx<lev_fieldx; xx++)
+ if (Feld[xx][yy] == smashed)
+ Feld[xx][yy] = activated_magic_wall;
game.magic_wall_time_left = level.time_magic_wall * FRAMES_PER_SECOND;
game.magic_wall_active = TRUE;
+
+ PlaySoundLevel(x, y, (smashed == EL_MAGIC_WALL_OFF ?
+ SND_MAGIC_WALL_ACTIVATING :
+ SND_BD_MAGIC_WALL_ACTIVATING));
}
if (IS_PLAYER(x, y+1))
return;
}
}
+ else if ((element == EL_SP_INFOTRON || element == EL_SP_ZONK) &&
+ (smashed == EL_SP_SNIKSNAK || smashed == EL_SP_ELECTRON ||
+ smashed == EL_SP_DISK_ORANGE))
+ {
+ Bang(x, y+1);
+ return;
+ }
else if (element == EL_FELSBROCKEN ||
element == EL_SP_ZONK ||
element == EL_BD_ROCK)
else if (smashed == EL_KOKOSNUSS)
{
Feld[x][y+1] = EL_CRACKINGNUT;
- PlaySoundLevel(x, y, SND_KNACK);
+ PlaySoundLevel(x, y, SND_NUT_CRACKING);
RaiseScoreElement(EL_KOKOSNUSS);
return;
}
else if (smashed == EL_PEARL)
{
Feld[x][y+1] = EL_PEARL_BREAKING;
- PlaySoundLevel(x, y, SND_KNACK);
+ PlaySoundLevel(x, y, SND_PEARL_BREAKING);
return;
}
else if (smashed == EL_DIAMANT)
{
Feld[x][y+1] = EL_LEERRAUM;
- PlaySoundLevel(x, y, SND_QUIRK);
+ PlaySoundLevel(x, y, SND_DIAMOND_BREAKING);
return;
}
else if (IS_BELT_SWITCH(smashed))
(Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ||
Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
{
- PlaySoundLevel(x, y, SND_QUIRK);
+ if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY)
+ PlaySoundLevel(x, y, SND_MAGIC_WALL_CHANGING);
+ else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)
+ PlaySoundLevel(x, y, SND_BD_MAGIC_WALL_CHANGING);
+
return;
}
{
int sound;
- switch(element)
+ switch (element)
{
- case EL_EDELSTEIN:
case EL_EDELSTEIN_BD:
+ sound = SND_BD_DIAMOND_IMPACT;
+ break;
+ case EL_EDELSTEIN:
case EL_EDELSTEIN_GELB:
case EL_EDELSTEIN_ROT:
case EL_EDELSTEIN_LILA:
+ sound = SND_EMERALD_IMPACT;
+ break;
case EL_DIAMANT:
+ sound = SND_DIAMOND_IMPACT;
+ break;
+ case EL_PEARL:
+ sound = SND_PEARL_IMPACT;
+ break;
+ case EL_CRYSTAL:
+ sound = SND_CRYSTAL_IMPACT;
+ break;
case EL_SP_INFOTRON:
- sound = SND_PLING;
+ sound = SND_SP_INFOTRON_IMPACT;
break;
case EL_KOKOSNUSS:
- sound = SND_KLUMPF;
+ sound = SND_NUT_IMPACT;
break;
- case EL_FELSBROCKEN:
case EL_BD_ROCK:
- sound = SND_KLOPF;
+ sound = SND_BD_ROCK_IMPACT;
break;
- case EL_SP_ZONK:
- sound = SND_SP_ZONKDOWN;
+ case EL_FELSBROCKEN:
+ sound = SND_ROCK_IMPACT;
break;
- case EL_SCHLUESSEL:
- case EL_SCHLUESSEL1:
- case EL_SCHLUESSEL2:
- case EL_SCHLUESSEL3:
- case EL_SCHLUESSEL4:
- case EL_EM_KEY_1:
- case EL_EM_KEY_2:
- case EL_EM_KEY_3:
- case EL_EM_KEY_4:
- sound = SND_KINK;
+ case EL_SP_ZONK:
+ sound = SND_SP_ZONK_IMPACT;
break;
case EL_ZEIT_VOLL:
+ sound = SND_TIME_ORB_FULL_IMPACT;
+ break;
case EL_ZEIT_LEER:
- sound = SND_DENG;
+ sound = SND_TIME_ORB_EMPTY_IMPACT;
+ break;
+ case EL_SPRING:
+ sound = SND_SPRING_IMPACT;
break;
default:
sound = -1;
if (element == EL_KAEFER || element == EL_BUTTERFLY)
{
- TestIfBadThingHitsOtherBadThing(x, y);
+ TestIfBadThingTouchesOtherBadThing(x, y);
if (IN_LEV_FIELD(right_x, right_y) &&
IS_FREE(right_x, right_y))
else if (element == EL_FLIEGER || element == EL_FIREFLY ||
element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
{
- TestIfBadThingHitsOtherBadThing(x, y);
+ TestIfBadThingTouchesOtherBadThing(x, y);
if (IN_LEV_FIELD(left_x, left_y) &&
IS_FREE(left_x, left_y))
InitMovingField(x, y, MV_DOWN);
Feld[x][y] = EL_QUICKSAND_EMPTYING;
Store[x][y] = EL_FELSBROCKEN;
+ PlaySoundLevel(x, y, SND_QUICKSAND_EMPTYING);
}
else if (Feld[x][y+1] == EL_MORAST_LEER)
{
Feld[x][y+1] = EL_MORAST_VOLL;
Store[x][y+1] = Store[x][y];
Store[x][y] = 0;
+ PlaySoundLevel(x, y, SND_QUICKSAND_SLIPPING_THROUGH);
}
}
else if ((element == EL_FELSBROCKEN || element == EL_BD_ROCK) &&
InitMovingField(x, y, MV_DOWN);
Feld[x][y] = EL_QUICKSAND_FILLING;
Store[x][y] = element;
+ PlaySoundLevel(x, y, SND_QUICKSAND_FILLING);
}
else if (element == EL_MAGIC_WALL_FULL)
{
element != EL_DX_SUPABOMB)
#endif
#else
- else if (IS_SLIPPERY(Feld[x][y+1]) &&
+ else if ((IS_SLIPPERY(Feld[x][y+1]) ||
+ (IS_EM_SLIPPERY_WALL(Feld[x][y+1]) && IS_GEM(element))) &&
!IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
- element != EL_DX_SUPABOMB)
+ element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
#endif
{
boolean left = (x>0 && IS_FREE(x-1, y) &&
{
int phase = MovDelay[x][y] % 8;
- if (phase>3)
- phase = 7-phase;
+ if (phase > 3)
+ phase = 7 - phase;
if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(element)+phase);
+ DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(element) + phase);
- if ((element == EL_MAMPFER || element == EL_MAMPFER2)
- && MovDelay[x][y]%4 == 3)
- PlaySoundLevel(x, y, SND_NJAM);
+ if (MovDelay[x][y] % 4 == 3)
+ {
+ if (element == EL_MAMPFER)
+ PlaySoundLevel(x, y, SND_YAMYAM_WAITING);
+ else if (element == EL_MAMPFER2)
+ PlaySoundLevel(x, y, SND_DARK_YAMYAM_WAITING);
+ }
}
else if (element == EL_SP_ELECTRON)
DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
return;
}
- if (element == EL_KAEFER || element == EL_BUTTERFLY)
- {
- PlaySoundLevel(x, y, SND_KLAPPER);
- }
- else if (element == EL_FLIEGER || element == EL_FIREFLY)
- {
- PlaySoundLevel(x, y, SND_ROEHR);
- }
+ if (element == EL_KAEFER)
+ PlaySoundLevel(x, y, SND_BUG_MOVING);
+ else if (element == EL_FLIEGER)
+ PlaySoundLevel(x, y, SND_SPACESHIP_MOVING);
+ else if (element == EL_BUTTERFLY)
+ PlaySoundLevel(x, y, SND_BD_BUTTERFLY_MOVING);
+ else if (element == EL_FIREFLY)
+ PlaySoundLevel(x, y, SND_BD_FIREFLY_MOVING);
+ else if (element == EL_SP_SNIKSNAK)
+ PlaySoundLevel(x, y, SND_SP_SNIKSNAK_MOVING);
+ else if (element == EL_SP_ELECTRON)
+ PlaySoundLevel(x, y, SND_SP_ELECTRON_MOVING);
+ else if (element == EL_MAMPFER)
+ PlaySoundLevel(x, y, SND_YAMYAM_MOVING);
+ else if (element == EL_MAMPFER2)
+ PlaySoundLevel(x, y, SND_DARK_YAMYAM_MOVING);
+ else if (element == EL_BALLOON)
+ PlaySoundLevel(x, y, SND_BALLOON_MOVING);
+ else if (element == EL_SPRING_MOVING)
+ PlaySoundLevel(x, y, SND_SPRING_MOVING);
+ else if (element == EL_MOLE)
+ PlaySoundLevel(x, y, SND_MOLE_MOVING);
+ else if (element == EL_SONDE)
+ PlaySoundLevel(x, y, SND_SATELLITE_MOVING);
+ else if (element == EL_PACMAN)
+ PlaySoundLevel(x, y, SND_PACMAN_MOVING);
+ else if (element == EL_PINGUIN)
+ PlaySoundLevel(x, y, SND_PENGUIN_MOVING);
+ else if (element == EL_SCHWEIN)
+ PlaySoundLevel(x, y, SND_PIG_MOVING);
+ else if (element == EL_DRACHE)
+ PlaySoundLevel(x, y, SND_DRAGON_MOVING);
/* now make next step */
{
#if 1
- TestIfBadThingHitsHero(x, y);
+ TestIfBadThingRunsIntoHero(x, y, MovDir[x][y]);
return;
#else
/* enemy got the player */
Feld[x][y] = EL_LEERRAUM;
DrawLevelField(x, y);
- PlaySoundLevel(newx, newy, SND_BUING);
+ PlaySoundLevel(newx, newy, SND_PENGUIN_ENTERING_EXIT);
if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
DrawGraphicThruMask(SCREENX(newx), SCREENY(newy), el2gfx(element));
Feld[newx][newy] = EL_LEERRAUM;
DrawLevelField(newx, newy);
}
+
+ PlaySoundLevel(x, y, SND_PIG_EATING_GEM);
}
else if (!IS_FREE(newx, newy))
{
else
DrawLevelField(x, y);
+ PlaySoundLevel(x, y, SND_DRAGON_BREATHING_FIRE);
+
MovDelay[x][y] = 50;
Feld[newx][newy] = EL_BURNING;
if (IN_LEV_FIELD(newx1, newy1) && Feld[newx1][newy1] == EL_LEERRAUM)
Feld[newx][newy] = EL_LEERRAUM;
DrawLevelField(newx, newy);
}
+
+ PlaySoundLevel(x, y, SND_YAMYAM_EATING_DIAMOND);
}
else if (element == EL_MAMPFER2 && IN_LEV_FIELD(newx, newy) &&
IS_MAMPF2(Feld[newx][newy]))
Feld[newx][newy] = EL_LEERRAUM;
DrawLevelField(newx, newy);
}
+
+ PlaySoundLevel(x, y, SND_DARK_YAMYAM_EATING_ANY);
}
else if ((element == EL_PACMAN || element == EL_MOLE)
&& IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Feld[newx][newy]))
if (element == EL_MOLE)
{
Feld[newx][newy] = EL_DEAMOEBING;
+ PlaySoundLevel(x, y, SND_MOLE_EATING_AMOEBA);
MovDelay[newx][newy] = 0; /* start amoeba shrinking delay */
return; /* wait for shrinking amoeba */
}
{
Feld[newx][newy] = EL_LEERRAUM;
DrawLevelField(newx, newy);
+ PlaySoundLevel(x, y, SND_PACMAN_EATING_AMOEBA);
}
}
else if (element == EL_MOLE && IN_LEV_FIELD(newx, newy) &&
DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
if (DONT_TOUCH(element))
- TestIfBadThingHitsHero(x, y);
+ TestIfBadThingTouchesHero(x, y);
return;
}
if (element == EL_ROBOT && IN_SCR_FIELD(x, y))
- PlaySoundLevel(x, y, SND_SCHLURF);
+ PlaySoundLevel(x, y, SND_ROBOT_MOVING);
InitMovingField(x, y, MovDir[x][y]);
}
if (DONT_TOUCH(element)) /* object may be nasty to player or others */
{
- TestIfBadThingHitsHero(newx, newy);
- TestIfBadThingHitsFriend(newx, newy);
- TestIfBadThingHitsOtherBadThing(newx, newy);
+ TestIfBadThingTouchesHero(newx, newy);
+ TestIfBadThingTouchesFriend(newx, newy);
+ TestIfBadThingTouchesOtherBadThing(newx, newy);
}
else if (element == EL_PINGUIN)
- TestIfFriendHitsBadThing(newx, newy);
+ TestIfFriendTouchesBadThing(newx, newy);
if (CAN_SMASH(element) && direction == MV_DOWN &&
(newy == lev_fieldy-1 || !IS_FREE(x, newy+1)))
}
}
}
+ PlaySoundLevel(ax, ay, (IS_GEM(level.amoeba_content) ?
+ SND_AMOEBA_TURNING_TO_GEM :
+ SND_AMOEBA_TURNING_TO_ROCK));
Bang(ax, ay);
}
else
continue;
if (Feld[x][y] == EL_AMOEBA2DIAM)
+ {
+ PlaySoundLevel(x, y, (IS_GEM(level.amoeba_content) ?
+ SND_AMOEBA_TURNING_TO_GEM :
+ SND_AMOEBA_TURNING_TO_ROCK));
Bang(x, y);
+ }
}
}
}
}
if (done)
- PlaySoundLevel(ax, ay,
- (new_element == EL_BD_ROCK ? SND_KLOPF : SND_PLING));
+ PlaySoundLevel(ax, ay, (new_element == EL_BD_ROCK ?
+ SND_BD_AMOEBA_TURNING_TO_ROCK :
+ SND_BD_AMOEBA_TURNING_TO_GEM));
}
void AmoebeWaechst(int x, int y)
if (DelayReached(&sound_delay, sound_delay_value))
{
- PlaySoundLevel(x, y, SND_AMOEBE);
+ if (Store[x][y] == EL_AMOEBE_BD)
+ PlaySoundLevel(x, y, SND_BD_AMOEBA_GROWING);
+ else
+ PlaySoundLevel(x, y, SND_AMOEBA_GROWING);
sound_delay_value = 30;
}
}
}
}
-void AmoebeSchrumpft(int x, int y)
+void AmoebaDisappearing(int x, int y)
{
static unsigned long sound_delay = 0;
static unsigned long sound_delay_value = 0;
MovDelay[x][y] = 7;
if (DelayReached(&sound_delay, sound_delay_value))
- {
- PlaySoundLevel(x, y, SND_BLURB);
sound_delay_value = 30;
- }
}
if (MovDelay[x][y]) /* wait some time before shrinking */
if (element != EL_AMOEBE_NASS || neway < ay || !IS_FREE(newax, neway) ||
(neway == lev_fieldy - 1 && newax != ax))
{
- Feld[newax][neway] = EL_AMOEBING;
+ Feld[newax][neway] = EL_AMOEBING; /* simple growth of new amoeba tile */
Store[newax][neway] = element;
}
else if (neway == ay)
- Feld[newax][neway] = EL_TROPFEN;
+ {
+ Feld[newax][neway] = EL_TROPFEN; /* drop left or right from amoeba */
+ PlaySoundLevel(newax, neway, SND_AMOEBA_DROPPING);
+ }
else
{
- InitMovingField(ax, ay, MV_DOWN);
+ InitMovingField(ax, ay, MV_DOWN); /* drop dripping out of amoeba */
Feld[ax][ay] = EL_AMOEBA_DRIPPING;
Store[ax][ay] = EL_TROPFEN;
ContinueMoving(ax, ay);
static int life[4] = { 2, 3, 3, 3 }; /* parameters for "game of life" */
int life_time = 40;
int element = Feld[ax][ay];
+ boolean changed = FALSE;
if (Stop[ax][ay])
return;
if (xx == ax && yy == ay) /* field in the middle */
{
- if (nachbarn<life[0] || nachbarn>life[1])
+ if (nachbarn < life[0] || nachbarn > life[1])
{
Feld[xx][yy] = EL_LEERRAUM;
if (!Stop[xx][yy])
DrawLevelField(xx, yy);
Stop[xx][yy] = TRUE;
+ changed = TRUE;
}
}
else if (IS_FREE(xx, yy) || Feld[xx][yy] == EL_ERDREICH)
{ /* free border field */
- if (nachbarn>=life[2] && nachbarn<=life[3])
+ if (nachbarn >= life[2] && nachbarn <= life[3])
{
Feld[xx][yy] = element;
MovDelay[xx][yy] = (element == EL_LIFE ? 0 : life_time-1);
if (!Stop[xx][yy])
DrawLevelField(xx, yy);
Stop[xx][yy] = TRUE;
+ changed = TRUE;
}
}
}
+
+ if (changed)
+ PlaySoundLevel(ax, ay, element == EL_LIFE ? SND_GAMEOFLIFE_GROWING :
+ SND_BIOMAZE_GROWING);
}
-void Ablenk(int x, int y)
+void RobotWheel(int x, int y)
{
if (!MovDelay[x][y]) /* next animation frame */
MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
DrawGraphic(SCREENX(x), SCREENY(y), GFX_ABLENK+MovDelay[x][y]%4);
if (!(MovDelay[x][y]%4))
- PlaySoundLevel(x, y, SND_MIEP);
+ PlaySoundLevel(x, y, SND_ROBOT_WHEEL_RUNNING);
return;
}
}
DrawGraphic(SCREENX(x), SCREENY(y),
GFX_TIMEGATE_SWITCH + MovDelay[x][y]%4);
if (!(MovDelay[x][y]%4))
- PlaySoundLevel(x, y, SND_MIEP);
+ PlaySoundLevel(x, y, SND_TIMEGATE_WHEEL_RUNNING);
return;
}
}
(x > LEVELX(BX2) ? LEVELX(BX2) : x),
y < LEVELY(BY1) ? LEVELY(BY1) :
(y > LEVELY(BY2) ? LEVELY(BY2) : y),
- SND_OEFFNEN);
+ SND_EXIT_OPENING);
}
}
if (element == EL_TIMEGATE_OPEN || element == EL_TIMEGATE_OPENING)
{
Feld[x][y] = EL_TIMEGATE_CLOSING;
- PlaySoundLevel(x, y, SND_OEFFNEN);
+ PlaySoundLevel(x, y, SND_TIMEGATE_CLOSING);
}
}
}
boolean links_frei = FALSE, rechts_frei = FALSE;
boolean oben_massiv = FALSE, unten_massiv = FALSE;
boolean links_massiv = FALSE, rechts_massiv = FALSE;
+ boolean new_wall = FALSE;
if (!MovDelay[ax][ay]) /* start building new wall */
MovDelay[ax][ay] = 6;
MovDir[ax][ay-1] = MV_UP;
if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1)))
DrawGraphic(SCREENX(ax), SCREENY(ay-1), GFX_MAUER_UP);
+ new_wall = TRUE;
}
if (unten_frei)
{
MovDir[ax][ay+1] = MV_DOWN;
if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1)))
DrawGraphic(SCREENX(ax), SCREENY(ay+1), GFX_MAUER_DOWN);
+ new_wall = TRUE;
}
}
MovDir[ax-1][ay] = MV_LEFT;
if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay)))
DrawGraphic(SCREENX(ax-1), SCREENY(ay), GFX_MAUER_LEFT);
+ new_wall = TRUE;
}
if (rechts_frei)
{
MovDir[ax+1][ay] = MV_RIGHT;
if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay)))
DrawGraphic(SCREENX(ax+1), SCREENY(ay), GFX_MAUER_RIGHT);
+ new_wall = TRUE;
}
}
((links_massiv && rechts_massiv) ||
element == EL_MAUER_Y))
Feld[ax][ay] = EL_MAUERWERK;
+
+ if (new_wall)
+ PlaySoundLevel(ax, ay, SND_WALL_GROWING);
}
void CheckForDragon(int x, int y)
if (IS_PLAYER(xx, yy))
{
- PlaySoundLevel(x, y, SND_SP_BUG);
+ PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVATING);
break;
}
}
return;
Feld[x][y] = EL_TRAP_ACTIVE;
+ PlaySoundLevel(x, y, SND_TRAP_ACTIVATING);
}
}
else if (element == EL_TRAP_ACTIVE)
{
static byte stored_player_action[MAX_PLAYERS];
static int num_stored_actions = 0;
+#if 0
static boolean save_tape_entry = FALSE;
+#endif
boolean moved = FALSE, snapped = FALSE, bombed = FALSE;
- int jx = player->jx, jy = player->jy;
int left = player_action & JOY_LEFT;
int right = player_action & JOY_RIGHT;
int up = player_action & JOY_UP;
if (player_action)
{
+#if 0
save_tape_entry = TRUE;
+#endif
player->frame_reset_delay = 0;
if (button1)
moved = MoveFigure(player, dx, dy);
}
+ if (tape.single_step && tape.recording && !tape.pausing)
+ {
+ if (button1 || (bombed && !moved))
+ {
+ TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+ SnapField(player, 0, 0); /* stop snapping */
+ }
+ }
+
+#if 0
if (tape.recording && (moved || snapped || bombed))
{
if (bombed && !moved)
player_action &= JOY_BUTTON;
stored_player_action[player->index_nr] = player_action;
+ save_tape_entry = TRUE;
}
else if (tape.playing && snapped)
SnapField(player, 0, 0); /* stop snapping */
+#else
+ stored_player_action[player->index_nr] = player_action;
+#endif
}
else
{
SnapField(player, 0, 0);
CheckGravityMovement(player);
+#if 1
+ if (player->MovPos == 0) /* needed for tape.playing */
+ player->is_moving = FALSE;
+#endif
+#if 0
+ if (player->MovPos == 0) /* needed for tape.playing */
+ player->last_move_dir = MV_NO_MOVING;
+
+ /* !!! CHECK THIS AGAIN !!!
+ (Seems to be needed for some EL_ROBOT stuff, but breaks
+ tapes when walking through pipes!)
+ */
+
+ /* it seems that "player->last_move_dir" is misused as some sort of
+ "player->is_just_moving_in_this_moment", which is needed for the
+ robot stuff (robots don't kill players when they are moving)
+ */
+#endif
+
if (++player->frame_reset_delay > player->move_delay_value)
player->Frame = 0;
}
+#if 0
if (tape.recording && num_stored_actions >= MAX_PLAYERS && save_tape_entry)
{
TapeRecordAction(stored_player_action);
num_stored_actions = 0;
save_tape_entry = FALSE;
}
+#else
+ if (tape.recording && num_stored_actions >= MAX_PLAYERS)
+ {
+ TapeRecordAction(stored_player_action);
+ num_stored_actions = 0;
+ }
+#endif
+#if 0
if (tape.playing && !tape.pausing && !player_action &&
tape.counter < tape.length)
{
+ int jx = player->jx, jy = player->jy;
int next_joy =
tape.pos[tape.counter].action[player->index_nr] & (JOY_LEFT|JOY_RIGHT);
}
}
}
+#endif
}
void GameActions()
action_delay_value =
(tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
+ if (tape.playing && tape.index_search && !tape.pausing)
+ action_delay_value = 0;
+
/* ---------- main game synchronization point ---------- */
WaitUntilDelayReached(&action_delay, action_delay_value);
if (tape.pausing)
return;
- if (tape.playing)
- TapePlayDelay();
- else if (tape.recording)
- TapeRecordDelay();
-
recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
for (i=0; i<MAX_PLAYERS; i++)
{
StartMoving(x, y);
- if (IS_GEM(element))
+ if (IS_GEM(element) || element == EL_SP_INFOTRON)
EdelsteinFunkeln(x, y);
}
else if (IS_MOVING(x, y))
ContinueMoving(x, y);
else if (IS_ACTIVE_BOMB(element))
CheckDynamite(x, y);
+#if 0
else if (element == EL_EXPLODING && !game.explosions_delayed)
Explode(x, y, Frame[x][y], EX_NORMAL);
+#endif
else if (element == EL_AMOEBING)
AmoebeWaechst(x, y);
else if (element == EL_DEAMOEBING)
- AmoebeSchrumpft(x, y);
+ AmoebaDisappearing(x, y);
+
+#if !USE_NEW_AMOEBA_CODE
else if (IS_AMOEBALIVE(element))
AmoebeAbleger(x, y);
+#endif
+
else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
Life(x, y);
else if (element == EL_ABLENK_EIN)
- Ablenk(x, y);
+ RobotWheel(x, y);
else if (element == EL_TIMEGATE_SWITCH_ON)
TimegateWheel(x, y);
else if (element == EL_SALZSAEURE)
else if (element == EL_SP_TERMINAL_ACTIVE)
DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL_ACTIVE, 7, 4, ANIM_NORMAL);
else if (IS_BELT(element))
+ {
DrawBeltAnimation(x, y, element);
+ if (!(FrameCounter % 2))
+ PlaySoundLevel(x, y, SND_CONVEYOR_BELT_RUNNING);
+ }
else if (element == EL_SWITCHGATE_OPENING)
OpenSwitchgate(x, y);
else if (element == EL_SWITCHGATE_CLOSING)
else if (element == EL_EXTRA_TIME)
DrawGraphicAnimation(x, y, GFX_EXTRA_TIME, 6, 4, ANIM_NORMAL);
else if (element == EL_SHIELD_PASSIVE)
+ {
DrawGraphicAnimation(x, y, GFX_SHIELD_PASSIVE, 6, 4, ANIM_NORMAL);
+ if (!(FrameCounter % 4))
+ PlaySoundLevel(x, y, SND_SHIELD_PASSIVE_ACTIVATED);
+ }
else if (element == EL_SHIELD_ACTIVE)
+ {
DrawGraphicAnimation(x, y, GFX_SHIELD_ACTIVE, 6, 4, ANIM_NORMAL);
+ if (!(FrameCounter % 4))
+ PlaySoundLevel(x, y, SND_SHIELD_ACTIVE_ACTIVATED);
+ }
if (game.magic_wall_active)
{
}
}
+#if USE_NEW_AMOEBA_CODE
+ /* new experimental amoeba growth stuff */
+#if 1
+ if (!(FrameCounter % 8))
+#endif
+ {
+ static unsigned long random = 1684108901;
+
+ for (i = 0; i < level.amoeba_speed * 28 / 8; i++)
+ {
+#if 0
+ x = (random >> 10) % lev_fieldx;
+ y = (random >> 20) % lev_fieldy;
+#else
+ x = RND(lev_fieldx);
+ y = RND(lev_fieldy);
+#endif
+ element = Feld[x][y];
+
+ if (!IS_PLAYER(x,y) &&
+ (element == EL_LEERRAUM ||
+ element == EL_ERDREICH ||
+ element == EL_MORAST_LEER ||
+ element == EL_BLURB_LEFT ||
+ element == EL_BLURB_RIGHT))
+ {
+ if ((IN_LEV_FIELD(x, y-1) && Feld[x][y-1] == EL_AMOEBE_NASS) ||
+ (IN_LEV_FIELD(x-1, y) && Feld[x-1][y] == EL_AMOEBE_NASS) ||
+ (IN_LEV_FIELD(x+1, y) && Feld[x+1][y] == EL_AMOEBE_NASS) ||
+ (IN_LEV_FIELD(x, y+1) && Feld[x][y+1] == EL_AMOEBE_NASS))
+ Feld[x][y] = EL_TROPFEN;
+ }
+
+ random = random * 129 + 1;
+ }
+ }
+#endif
+
+#if 0
if (game.explosions_delayed)
+#endif
{
game.explosions_delayed = FALSE;
for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
{
+ element = Feld[x][y];
+
if (ExplodeField[x][y])
Explode(x, y, EX_PHASE_START, ExplodeField[x][y]);
- else if (Feld[x][y] == EL_EXPLODING)
+ else if (element == EL_EXPLODING)
Explode(x, y, Frame[x][y], EX_NORMAL);
+
ExplodeField[x][y] = EX_NO_EXPLOSION;
}
if (game.magic_wall_active)
{
if (!(game.magic_wall_time_left % 4))
- PlaySoundLevel(sieb_x, sieb_y, SND_MIEP);
+ {
+ int element = Feld[sieb_x][sieb_y];
+
+ if (element == EL_MAGIC_WALL_BD_FULL ||
+ element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_EMPTYING)
+ PlaySoundLevel(sieb_x, sieb_y, SND_BD_MAGIC_WALL_RUNNING);
+ else
+ PlaySoundLevel(sieb_x, sieb_y, SND_MAGIC_WALL_RUNNING);
+ }
if (game.magic_wall_time_left > 0)
{
TimeLeft--;
if (TimeLeft <= 10 && setup.time_limit)
- PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+ PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, PSND_MAX_RIGHT);
DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
for (i=0; i<MAX_PLAYERS; i++)
KillHero(&stored_player[i]);
}
- else if (level.time == 0) /* level without time limit */
+ else if (level.time == 0 && !AllPlayersGone) /* level without time limit */
DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
}
BuryHero(player);
}
else
- TestIfBadThingHitsHero(new_jx, new_jy);
+ TestIfHeroRunsIntoBadThing(jx, jy, player->MovDir);
return MF_MOVING;
}
if (!player->active || (!dx && !dy))
return FALSE;
+#if 0
if (!FrameReached(&player->move_delay, player->move_delay_value) &&
!tape.playing)
return FALSE;
+#else
+ if (!FrameReached(&player->move_delay, player->move_delay_value) &&
+ !(tape.playing && tape.game_version < GAME_VERSION_2_0))
+ return FALSE;
+#endif
/* remove the last programmed player action */
player->programmed_action = 0;
DrawLevelField(jx, jy); /* for "ErdreichAnbroeckeln()" */
player->last_move_dir = player->MovDir;
+ player->is_moving = TRUE;
}
else
{
CheckGravityMovement(player);
+ /*
player->last_move_dir = MV_NO_MOVING;
+ */
+ player->is_moving = FALSE;
}
- TestIfHeroHitsBadThing(jx, jy);
+ TestIfHeroTouchesBadThing(jx, jy);
if (!player->active)
RemoveHero(player);
if (!local_player->friends_still_needed)
player->LevelSolved = player->GameOver = TRUE;
}
+
+ if (tape.single_step && tape.recording && !tape.pausing &&
+ !player->programmed_action)
+ TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
}
}
ScreenMovDir = MV_NO_MOVING;
}
-void TestIfGoodThingHitsBadThing(int goodx, int goody)
+void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir)
{
- int i, killx = goodx, killy = goody;
- static int xy[4][2] =
+ int i, kill_x = -1, kill_y = -1;
+ static int test_xy[4][2] =
{
{ 0, -1 },
{ -1, 0 },
{ +1, 0 },
{ 0, +1 }
};
- static int harmless[4] =
+ static int test_dir[4] =
{
MV_UP,
MV_LEFT,
for (i=0; i<4; i++)
{
- int x, y, element;
+ int test_x, test_y, test_move_dir, test_element;
- x = goodx + xy[i][0];
- y = goody + xy[i][1];
- if (!IN_LEV_FIELD(x, y))
+ test_x = good_x + test_xy[i][0];
+ test_y = good_y + test_xy[i][1];
+ if (!IN_LEV_FIELD(test_x, test_y))
continue;
+ test_move_dir =
+ (IS_MOVING(test_x, test_y) ? MovDir[test_x][test_y] : MV_NO_MOVING);
+
#if 0
- element = Feld[x][y];
+ test_element = Feld[test_x][test_y];
#else
- element = MovingOrBlocked2ElementIfNotLeaving(x, y);
+ test_element = MovingOrBlocked2ElementIfNotLeaving(test_x, test_y);
#endif
- if (DONT_TOUCH(element))
+ /* 1st case: good thing is moving towards DONT_GO_TO style bad thing;
+ 2nd case: DONT_TOUCH style bad thing does not move away from good thing
+ */
+ if ((DONT_GO_TO(test_element) && good_move_dir == test_dir[i]) ||
+ (DONT_TOUCH(test_element) && test_move_dir != test_dir[i]))
{
- if (MovDir[x][y] == harmless[i])
- continue;
-
- killx = x;
- killy = y;
+ kill_x = test_x;
+ kill_y = test_y;
break;
}
}
- if (killx != goodx || killy != goody)
+ if (kill_x != -1 || kill_y != -1)
{
- if (IS_PLAYER(goodx, goody))
+ if (IS_PLAYER(good_x, good_y))
{
- struct PlayerInfo *player = PLAYERINFO(goodx, goody);
+ struct PlayerInfo *player = PLAYERINFO(good_x, good_y);
if (player->shield_active_time_left > 0)
- Bang(killx, killy);
- else if (!PLAYER_PROTECTED(goodx, goody))
+ Bang(kill_x, kill_y);
+ else if (!PLAYER_PROTECTED(good_x, good_y))
KillHero(player);
}
else
- Bang(goodx, goody);
+ Bang(good_x, good_y);
}
}
-void TestIfBadThingHitsGoodThing(int badx, int bady)
+void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
{
- int i, killx = badx, killy = bady;
- static int xy[4][2] =
+ int i, kill_x = -1, kill_y = -1;
+ int bad_element = Feld[bad_x][bad_y];
+ static int test_xy[4][2] =
{
{ 0, -1 },
{ -1, 0 },
{ +1, 0 },
{ 0, +1 }
};
- static int harmless[4] =
+ static int test_dir[4] =
{
MV_UP,
MV_LEFT,
MV_DOWN
};
- if (Feld[badx][bady] == EL_EXPLODING) /* skip just exploding bad things */
+ if (bad_element == EL_EXPLODING) /* skip just exploding bad things */
return;
for (i=0; i<4; i++)
{
- int x, y, element;
+ int test_x, test_y, test_move_dir, test_element;
- x = badx + xy[i][0];
- y = bady + xy[i][1];
- if (!IN_LEV_FIELD(x, y))
+ test_x = bad_x + test_xy[i][0];
+ test_y = bad_y + test_xy[i][1];
+ if (!IN_LEV_FIELD(test_x, test_y))
continue;
- element = Feld[x][y];
+ test_move_dir =
+ (IS_MOVING(test_x, test_y) ? MovDir[test_x][test_y] : MV_NO_MOVING);
- if (IS_PLAYER(x, y))
- {
- killx = x;
- killy = y;
- break;
- }
- else if (element == EL_PINGUIN)
+ test_element = Feld[test_x][test_y];
+
+ /* 1st case: good thing is moving towards DONT_GO_TO style bad thing;
+ 2nd case: DONT_TOUCH style bad thing does not move away from good thing
+ */
+ if ((DONT_GO_TO(bad_element) && bad_move_dir == test_dir[i]) ||
+ (DONT_TOUCH(bad_element) && test_move_dir != test_dir[i]))
{
- if (MovDir[x][y] == harmless[i] && IS_MOVING(x, y))
- continue;
+ /* good thing is player or penguin that does not move away */
+ if (IS_PLAYER(test_x, test_y))
+ {
+ struct PlayerInfo *player = PLAYERINFO(test_x, test_y);
- killx = x;
- killy = y;
- break;
+ if (bad_element == EL_ROBOT && player->is_moving)
+ continue; /* robot does not kill player if he is moving */
+
+ kill_x = test_x;
+ kill_y = test_y;
+ break;
+ }
+ else if (test_element == EL_PINGUIN)
+ {
+ kill_x = test_x;
+ kill_y = test_y;
+ break;
+ }
}
}
- if (killx != badx || killy != bady)
+ if (kill_x != -1 || kill_y != -1)
{
- if (IS_PLAYER(killx, killy))
+ if (IS_PLAYER(kill_x, kill_y))
{
- struct PlayerInfo *player = PLAYERINFO(killx, killy);
+ struct PlayerInfo *player = PLAYERINFO(kill_x, kill_y);
+
+#if 0
+ int dir = player->MovDir;
+ int newx = player->jx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
+ int newy = player->jy + (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0);
+
+ if (Feld[bad_x][bad_y] == EL_ROBOT && player->is_moving &&
+ newx != bad_x && newy != bad_y)
+ ; /* robot does not kill player if he is moving */
+ else
+ printf("-> %d\n", player->MovDir);
+
+ if (Feld[bad_x][bad_y] == EL_ROBOT && player->is_moving &&
+ newx != bad_x && newy != bad_y)
+ ; /* robot does not kill player if he is moving */
+ else
+ ;
+#endif
if (player->shield_active_time_left > 0)
- Bang(badx, bady);
- else if (!PLAYER_PROTECTED(killx, killy))
+ Bang(bad_x, bad_y);
+ else if (!PLAYER_PROTECTED(kill_x, kill_y))
KillHero(player);
}
else
- Bang(killx, killy);
+ Bang(kill_x, kill_y);
}
}
-void TestIfHeroHitsBadThing(int x, int y)
+void TestIfHeroTouchesBadThing(int x, int y)
{
- TestIfGoodThingHitsBadThing(x, y);
+ TestIfGoodThingHitsBadThing(x, y, MV_NO_MOVING);
}
-void TestIfBadThingHitsHero(int x, int y)
+void TestIfHeroRunsIntoBadThing(int x, int y, int move_dir)
{
- TestIfBadThingHitsGoodThing(x, y);
+ TestIfGoodThingHitsBadThing(x, y, move_dir);
}
-void TestIfFriendHitsBadThing(int x, int y)
+void TestIfBadThingTouchesHero(int x, int y)
{
- TestIfGoodThingHitsBadThing(x, y);
+ TestIfBadThingHitsGoodThing(x, y, MV_NO_MOVING);
}
-void TestIfBadThingHitsFriend(int x, int y)
+void TestIfBadThingRunsIntoHero(int x, int y, int move_dir)
{
- TestIfBadThingHitsGoodThing(x, y);
+ TestIfBadThingHitsGoodThing(x, y, move_dir);
}
-void TestIfBadThingHitsOtherBadThing(int badx, int bady)
+void TestIfFriendTouchesBadThing(int x, int y)
{
- int i, killx = badx, killy = bady;
+ TestIfGoodThingHitsBadThing(x, y, MV_NO_MOVING);
+}
+
+void TestIfBadThingTouchesFriend(int x, int y)
+{
+ TestIfBadThingHitsGoodThing(x, y, MV_NO_MOVING);
+}
+
+void TestIfBadThingTouchesOtherBadThing(int bad_x, int bad_y)
+{
+ int i, kill_x = bad_x, kill_y = bad_y;
static int xy[4][2] =
{
{ 0, -1 },
{
int x, y, element;
- x=badx + xy[i][0];
- y=bady + xy[i][1];
+ x = bad_x + xy[i][0];
+ y = bad_y + xy[i][1];
if (!IN_LEV_FIELD(x, y))
continue;
if (IS_AMOEBOID(element) || element == EL_LIFE ||
element == EL_AMOEBING || element == EL_TROPFEN)
{
- killx = x;
- killy = y;
+ kill_x = x;
+ kill_y = y;
break;
}
}
- if (killx != badx || killy != bady)
- Bang(badx, bady);
+ if (kill_x != bad_x || kill_y != bad_y)
+ Bang(bad_x, bad_y);
}
void KillHero(struct PlayerInfo *player)
if (!player->active)
return;
- PlaySoundLevel(jx, jy, SND_AUTSCH);
- PlaySoundLevel(jx, jy, SND_LACHEN);
+ PlaySoundLevel(jx, jy, SND_PLAYER_DYING);
+ PlaySoundLevel(jx, jy, SND_GAME_LOSING);
player->GameOver = TRUE;
RemoveHero(player);
player->present = FALSE;
player->active = FALSE;
- StorePlayer[jx][jy] = 0;
+ if (!ExplodeField[jx][jy])
+ StorePlayer[jx][jy] = 0;
for (i=0; i<MAX_PLAYERS; i++)
if (stored_player[i].active)
switch (element)
{
case EL_LEERRAUM:
- PlaySoundLevel(x, y, SND_EMPTY);
- break;
-
case EL_ERDREICH:
case EL_SAND_INVISIBLE:
case EL_TRAP_INACTIVE:
- Feld[x][y] = EL_LEERRAUM;
- PlaySoundLevel(x, y, SND_SCHLURF);
- break;
-
case EL_SP_BASE:
case EL_SP_BUG:
- Feld[x][y] = EL_LEERRAUM;
- PlaySoundLevel(x, y, SND_SP_BASE);
+ RemoveField(x, y);
+
+ if (element == EL_LEERRAUM)
+ PlaySoundLevel(x, y, SND_EMPTY_SPACE_DIGGING);
+ else if (element == EL_ERDREICH)
+ PlaySoundLevel(x, y, SND_SAND_DIGGING);
+ else if (element == EL_SAND_INVISIBLE)
+ PlaySoundLevel(x, y, SND_SAND_INVISIBLE_DIGGING);
+ else if (element == EL_TRAP_INACTIVE)
+ PlaySoundLevel(x, y, SND_TRAP_INACTIVE_DIGGING);
+ else if (element == EL_SP_BASE)
+ PlaySoundLevel(x, y, SND_SP_BASE_DIGGING);
+ else if (element == EL_SP_BUG)
+ PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_DIGGING);
break;
case EL_EDELSTEIN:
DrawText(DX_EMERALDS, DY_EMERALDS,
int2str(local_player->gems_still_needed, 3),
FS_SMALL, FC_YELLOW);
- if (element == EL_SP_INFOTRON)
- PlaySoundLevel(x, y, SND_SP_INFOTRON);
- else
- PlaySoundLevel(x, y, SND_PONG);
+
+ if (element == EL_EDELSTEIN_BD)
+ PlaySoundLevel(x, y, SND_BD_DIAMOND_COLLECTING);
+ else if (element == EL_DIAMANT)
+ PlaySoundLevel(x, y, SND_DIAMOND_COLLECTING);
+ else if (element == EL_SP_INFOTRON)
+ PlaySoundLevel(x, y, SND_SP_INFOTRON_COLLECTING);
+ else if (element == EL_PEARL)
+ PlaySoundLevel(x, y, SND_PEARL_COLLECTING);
+ else if (element == EL_CRYSTAL)
+ PlaySoundLevel(x, y, SND_CRYSTAL_COLLECTING);
+ else /* EL_EDELSTEIN style element */
+ PlaySoundLevel(x, y, SND_EMERALD_COLLECTING);
break;
case EL_SPEED_PILL:
RemoveField(x, y);
player->move_delay_value = MOVE_DELAY_HIGH_SPEED;
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_SPEED_PILL_COLLECTING);
break;
case EL_ENVELOPE:
Feld[x][y] = EL_LEERRAUM;
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_ENVELOPE_COLLECTING);
break;
case EL_EXTRA_TIME:
TimeLeft += 10;
DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
}
- PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+ PlaySoundStereo(SND_EXTRA_TIME_COLLECTING, PSND_MAX_RIGHT);
break;
case EL_SHIELD_PASSIVE:
RemoveField(x, y);
player->shield_passive_time_left += 10;
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_SHIELD_PASSIVE_COLLECTING);
break;
case EL_SHIELD_ACTIVE:
RemoveField(x, y);
player->shield_passive_time_left += 10;
player->shield_active_time_left += 10;
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_SHIELD_ACTIVE_COLLECTING);
break;
case EL_DYNAMITE_INACTIVE:
int2str(local_player->dynamite, 3),
FS_SMALL, FC_YELLOW);
if (element == EL_SP_DISK_RED)
- PlaySoundLevel(x, y, SND_SP_INFOTRON);
+ PlaySoundLevel(x, y, SND_SP_DISK_RED_COLLECTING);
else
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_DYNAMITE_COLLECTING);
break;
case EL_DYNABOMB_NR:
player->dynabomb_count++;
player->dynabombs_left++;
RaiseScoreElement(EL_DYNAMITE_INACTIVE);
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_DYNABOMB_NR_COLLECTING);
break;
case EL_DYNABOMB_SZ:
RemoveField(x, y);
player->dynabomb_size++;
RaiseScoreElement(EL_DYNAMITE_INACTIVE);
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_DYNABOMB_SZ_COLLECTING);
break;
case EL_DYNABOMB_XL:
RemoveField(x, y);
player->dynabomb_xl = TRUE;
RaiseScoreElement(EL_DYNAMITE_INACTIVE);
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_DYNABOMB_XL_COLLECTING);
break;
case EL_SCHLUESSEL1:
GFX_SCHLUESSEL1 + key_nr);
DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
GFX_SCHLUESSEL1 + key_nr);
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_KEY_COLLECTING);
break;
}
GFX_SCHLUESSEL1 + key_nr);
DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
GFX_SCHLUESSEL1 + key_nr);
- PlaySoundLevel(x, y, SND_PONG);
+ PlaySoundLevel(x, y, SND_KEY_COLLECTING);
break;
}
ZX = x;
ZY = y;
DrawLevelField(x, y);
+ PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVATING);
return MF_ACTION;
break;
{
int xx, yy;
+ PlaySoundLevel(x, y, SND_SP_TERMINAL_ACTIVATING);
+
for (yy=0; yy<lev_fieldy; yy++)
{
for (xx=0; xx<lev_fieldx; xx++)
{
player->Switching = TRUE;
ToggleBeltSwitch(x, y);
+ PlaySoundLevel(x, y, SND_CONVEYOR_BELT_SWITCH_ACTIVATING);
}
return MF_ACTION;
break;
{
player->Switching = TRUE;
ToggleSwitchgateSwitch(x, y);
+ PlaySoundLevel(x, y, SND_SWITCHGATE_SWITCH_ACTIVATING);
}
return MF_ACTION;
break;
{
player->Switching = TRUE;
ToggleLightSwitch(x, y);
+ PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH_OFF ?
+ SND_LIGHT_SWITCH_ACTIVATING :
+ SND_LIGHT_SWITCH_DEACTIVATING);
}
return MF_ACTION;
break;
case EL_TIMEGATE_SWITCH_OFF:
ActivateTimegateSwitch(x, y);
+ PlaySoundLevel(x, y, SND_TIMEGATE_WHEEL_ACTIVATING);
return MF_ACTION;
break;
return MF_NO_ACTION;
player->LevelSolved = player->GameOver = TRUE;
- PlaySoundStereo(SND_SP_EXIT, PSND_MAX_RIGHT);
+ PlaySoundStereo(SND_SP_EXIT_ENTERING, PSND_MAX_RIGHT);
break;
case EL_FELSBROCKEN:
if (player->push_delay == 0)
player->push_delay = FrameCounter;
+#if 0
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
!tape.playing && element != EL_SPRING)
return MF_NO_ACTION;
+#else
+ if (!FrameReached(&player->push_delay, player->push_delay_value) &&
+ !(tape.playing && tape.game_version < GAME_VERSION_2_0) &&
+ element != EL_SPRING)
+ return MF_NO_ACTION;
+#endif
RemoveField(x, y);
Feld[x+dx][y+dy] = element;
player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));
DrawLevelField(x+dx, y+dy);
- if (element == EL_FELSBROCKEN || element == EL_BD_ROCK)
- PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
+ if (element == EL_FELSBROCKEN)
+ PlaySoundLevel(x+dx, y+dy, SND_ROCK_PUSHING);
+ else if (element == EL_BD_ROCK)
+ PlaySoundLevel(x+dx, y+dy, SND_BD_ROCK_PUSHING);
+ else if (element == EL_BOMBE)
+ PlaySoundLevel(x+dx, y+dy, SND_BOMB_PUSHING);
+ else if (element == EL_DX_SUPABOMB)
+ PlaySoundLevel(x+dx, y+dy, SND_DX_BOMB_PUSHING);
else if (element == EL_KOKOSNUSS)
- PlaySoundLevel(x+dx, y+dy, SND_KNURK);
- else if (IS_SP_ELEMENT(element))
- PlaySoundLevel(x+dx, y+dy, SND_SP_ZONKPUSH);
- else
- PlaySoundLevel(x+dx, y+dy, SND_PUSCH); /* better than "SND_KLOPF" */
+ PlaySoundLevel(x+dx, y+dy, SND_NUT_PUSHING);
+ else if (element == EL_ZEIT_LEER)
+ PlaySoundLevel(x+dx, y+dy, SND_TIME_ORB_EMPTY_PUSHING);
+ else if (element == EL_SP_ZONK)
+ PlaySoundLevel(x+dx, y+dy, SND_SP_ZONK_PUSHING);
+ else if (element == EL_SP_DISK_ORANGE)
+ PlaySoundLevel(x+dx, y+dy, SND_SP_DISK_ORANGE_PUSHING);
+ else if (element == EL_SPRING)
+ PlaySoundLevel(x+dx, y+dy, SND_SPRING_PUSHING);
break;
case EL_PFORTE1:
player->programmed_action = move_direction;
DOUBLE_PLAYER_SPEED(player);
- PlaySoundLevel(x, y, SND_GATE);
+ PlaySoundLevel(x, y, SND_GATE_PASSING);
break;
player->programmed_action = move_direction;
DOUBLE_PLAYER_SPEED(player);
- PlaySoundLevel(x, y, SND_GATE);
+ PlaySoundLevel(x, y, SND_GATE_PASSING);
break;
player->programmed_action = move_direction;
DOUBLE_PLAYER_SPEED(player);
- PlaySoundLevel(x, y, SND_GATE);
+ if (element == EL_SWITCHGATE_OPEN)
+ PlaySoundLevel(x, y, SND_SWITCHGATE_PASSING);
+ else
+ PlaySoundLevel(x, y, SND_TIMEGATE_PASSING);
break;
player->programmed_action = move_direction;
DOUBLE_PLAYER_SPEED(player);
- PlaySoundLevel(x, y, SND_GATE);
+ PlaySoundLevel(x, y, SND_SP_PORT_PASSING);
break;
case EL_TUBE_CROSS:
if (mode == DF_SNAP)
return MF_NO_ACTION;
- PlaySoundLevel(x, y, SND_BUING);
+ PlaySoundLevel(x, y, SND_EXIT_ENTERING);
break;
Feld[x][y] = EL_BIRNE_EIN;
local_player->lights_still_needed--;
DrawLevelField(x, y);
- PlaySoundLevel(x, y, SND_DENG);
+ PlaySoundLevel(x, y, SND_LAMP_ACTIVATING);
return MF_ACTION;
break;
TimeLeft += 10;
DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
DrawLevelField(x, y);
- PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+ PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, PSND_MAX_RIGHT);
return MF_ACTION;
break;
case EL_SOKOBAN_FELD_LEER:
break;
- case EL_SOKOBAN_FELD_VOLL:
case EL_SOKOBAN_OBJEKT:
+ case EL_SOKOBAN_FELD_VOLL:
case EL_SONDE:
case EL_SP_DISK_YELLOW:
case EL_BALLOON:
if (player->push_delay == 0)
player->push_delay = FrameCounter;
+#if 0
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
!tape.playing && element != EL_BALLOON)
return MF_NO_ACTION;
+#else
+ if (!FrameReached(&player->push_delay, player->push_delay_value) &&
+ !(tape.playing && tape.game_version < GAME_VERSION_2_0) &&
+ element != EL_BALLOON)
+ return MF_NO_ACTION;
+#endif
if (IS_SB_ELEMENT(element))
{
Feld[x+dx][y+dy] = EL_SOKOBAN_FELD_VOLL;
local_player->sokobanfields_still_needed--;
if (element == EL_SOKOBAN_OBJEKT)
- PlaySoundLevel(x, y, SND_DENG);
+ PlaySoundLevel(x, y, SND_SOKOBAN_FIELD_FILLING);
+ else
+ PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING);
}
else
+ {
Feld[x+dx][y+dy] = EL_SOKOBAN_OBJEKT;
+ if (element == EL_SOKOBAN_FELD_VOLL)
+ PlaySoundLevel(x, y, SND_SOKOBAN_FIELD_CLEARING);
+ else
+ PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING);
+ }
}
else
{
DrawLevelField(x, y);
DrawLevelField(x+dx, y+dy);
- if (element == EL_BALLOON)
- PlaySoundLevel(x+dx, y+dy, SND_SCHLURF);
- else
- PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
+ if (element == EL_SONDE)
+ PlaySoundLevel(x+dx, y+dy, SND_SATELLITE_PUSHING);
+ else if (element == EL_SP_DISK_YELLOW)
+ PlaySoundLevel(x+dx, y+dy, SND_SP_DISK_YELLOW_PUSHING);
+ else if (element == EL_BALLOON)
+ PlaySoundLevel(x+dx, y+dy, SND_BALLOON_PUSHING);
if (IS_SB_ELEMENT(element) &&
local_player->sokobanfields_still_needed == 0 &&
game.emulation == EMU_SOKOBAN)
{
player->LevelSolved = player->GameOver = TRUE;
- PlaySoundLevel(x, y, SND_BUING);
+ PlaySoundLevel(x, y, SND_SOKOBAN_GAME_SOLVING);
}
break;
else
DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);
}
+
+ PlaySoundLevel(jx, jy, SND_DYNAMITE_PLACING);
}
else
{
player->dynabombs_left--;
if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNABOMB);
+
+ PlaySoundLevel(jx, jy, SND_DYNABOMB_PLACING);
}
return TRUE;
}
-void PlaySoundLevel(int x, int y, int sound_nr)
+void PlaySoundLevel(int x, int y, int nr)
{
int sx = SCREENX(x), sy = SCREENY(y);
- int volume, stereo;
+ int volume, stereo_position;
int silence_distance = 8;
+ int type = (IS_LOOP_SOUND(nr) ? SND_CTRL_PLAY_LOOP : SND_CTRL_PLAY_SOUND);
- if ((!setup.sound_simple && !IS_LOOP_SOUND(sound_nr)) ||
- (!setup.sound_loops && IS_LOOP_SOUND(sound_nr)))
+ if ((!setup.sound_simple && !IS_LOOP_SOUND(nr)) ||
+ (!setup.sound_loops && IS_LOOP_SOUND(nr)))
return;
if (!IN_LEV_FIELD(x, y) ||
- sx < -silence_distance || sx >= SCR_FIELDX+silence_distance ||
- sy < -silence_distance || sy >= SCR_FIELDY+silence_distance)
+ sx < -silence_distance || sx >= SCR_FIELDX + silence_distance ||
+ sy < -silence_distance || sy >= SCR_FIELDY + silence_distance)
return;
volume = PSND_MAX_VOLUME;
#if !defined(PLATFORM_MSDOS)
- stereo = (sx - SCR_FIELDX/2) * 12;
+ stereo_position = (sx - SCR_FIELDX / 2) * 12;
#else
- stereo = PSND_MIDDLE + (2 * sx - (SCR_FIELDX - 1)) * 5;
- if (stereo > PSND_MAX_RIGHT)
- stereo = PSND_MAX_RIGHT;
- if (stereo < PSND_MAX_LEFT)
- stereo = PSND_MAX_LEFT;
+ stereo_position = PSND_MIDDLE + (2 * sx - (SCR_FIELDX - 1)) * 5;
+ if (stereo_position > PSND_MAX_RIGHT)
+ stereo_position = PSND_MAX_RIGHT;
+ if (stereo_position < PSND_MAX_LEFT)
+ stereo_position = PSND_MAX_LEFT;
#endif
if (!IN_SCR_FIELD(sx, sy))
volume -= volume * (dx > dy ? dx : dy) / silence_distance;
}
- PlaySoundExt(sound_nr, volume, stereo, PSND_NO_LOOP);
+ PlaySoundExt(nr, volume, stereo_position, type);
}
void RaiseScore(int value)
}
}
+void RequestQuitGame(boolean ask_if_really_quit)
+{
+ if (AllPlayersGone ||
+ !ask_if_really_quit ||
+ level_editor_test_game ||
+ Request("Do you really want to quit the game ?",
+ REQ_ASK | REQ_STAY_CLOSED))
+ {
+#if defined(PLATFORM_UNIX)
+ if (options.network)
+ SendToServer_StopPlaying();
+ else
+#endif
+ {
+ game_status = MAINMENU;
+ DrawMainMenu();
+ }
+ }
+ else
+ {
+ OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+ }
+}
+
+
/* ---------- new game button stuff ---------------------------------------- */
/* graphic position values for game buttons */
switch (id)
{
case GAME_CTRL_ID_STOP:
- if (AllPlayersGone)
- {
- CloseDoor(DOOR_CLOSE_1);
- game_status = MAINMENU;
- DrawMainMenu();
- break;
- }
-
- if (level_editor_test_game ||
- Request("Do you really want to quit the game ?",
- REQ_ASK | REQ_STAY_CLOSED))
- {
-#if defined(PLATFORM_UNIX)
- if (options.network)
- SendToServer_StopPlaying();
- else
-#endif
- {
- game_status = MAINMENU;
- DrawMainMenu();
- }
- }
- else
- OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+ RequestQuitGame(TRUE);
break;
case GAME_CTRL_ID_PAUSE:
#endif
}
else
- TapeTogglePause();
+ TapeTogglePause(TAPE_TOGGLE_MANUAL);
break;
case GAME_CTRL_ID_PLAY:
setup.sound_music = FALSE;
FadeMusic();
}
- else if (audio.loops_available)
+ else if (audio.music_available)
{
setup.sound = setup.sound_music = TRUE;
- if (num_bg_loops)
- PlayMusic(level_nr % num_bg_loops);
+ PlayMusic(level_nr);
}
break;
projects / rocksndiamonds.git / blobdiff