/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back! *
+* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-98 Artsoft Entertainment *
-* Holger Schemel *
-* Oststrasse 11a *
-* 33604 Bielefeld *
-* phone: ++49 +521 290471 *
-* email: aeglos@valinor.owl.de *
+* (c) 1995-2001 Artsoft Entertainment *
+* Holger Schemel *
+* Detmolder Strasse 189 *
+* 33604 Bielefeld *
+* Germany *
+* e-mail: info@artsoft.org *
*----------------------------------------------------------*
-* game.c *
+* game.c *
***********************************************************/
+#include "libgame/libgame.h"
+
#include "game.h"
-#include "misc.h"
#include "tools.h"
#include "screens.h"
-#include "sound.h"
#include "init.h"
-#include "buttons.h"
#include "files.h"
#include "tape.h"
#include "joystick.h"
/* for Explode() */
#define EX_PHASE_START 0
-#define EX_NORMAL 0
-#define EX_CENTER 1
-#define EX_BORDER 2
+#define EX_NO_EXPLOSION 0
+#define EX_NORMAL 1
+#define EX_CENTER 2
+#define EX_BORDER 3
/* special positions in the game control window (relative to control window) */
#define XX_LEVEL 37
/* forward declaration for internal use */
static void CloseAllOpenTimegates(void);
static void CheckGravityMovement(struct PlayerInfo *);
-static void KillHeroUnlessShield(struct PlayerInfo *);
+static void KillHeroUnlessProtected(int, int);
static void MapGameButtons();
static void HandleGameButtons(struct GadgetInfo *);
void GetPlayerConfig()
{
- if (sound_status == SOUND_OFF)
+ if (!audio.sound_available)
setup.sound = FALSE;
- if (!sound_loops_allowed)
+ if (!audio.loops_available)
{
setup.sound_loops = FALSE;
setup.sound_music = FALSE;
}
+ if (!video.fullscreen_available)
+ setup.fullscreen = FALSE;
+
setup.sound_simple = setup.sound;
+ SetAudioMode(setup.sound);
InitJoysticks();
}
{
switch (Feld[x][y])
{
- case EL_SPIELFIGUR:
case EL_SP_MURPHY:
+ if (init_game)
+ {
+ if (stored_player[0].present)
+ {
+ Feld[x][y] = EL_SP_MURPHY_CLONE;
+ break;
+ }
+ }
+ /* no break! */
+ case EL_SPIELFIGUR:
if (init_game)
Feld[x][y] = EL_SPIELER1;
/* no break! */
network_player_action_received = FALSE;
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
/* initial null action */
if (network_playing)
SendToServer_MovePlayer(MV_NO_MOVING);
ZX = ZY = -1;
- game.yam_content_nr = 0;
FrameCounter = 0;
TimeFrames = 0;
TimePlayed = 0;
ScrollStepSize = 0; /* will be correctly initialized by ScrollScreen() */
AllPlayersGone = FALSE;
+
+ game.yam_content_nr = 0;
game.magic_wall_active = FALSE;
game.magic_wall_time_left = 0;
game.light_time_left = 0;
game.timegate_time_left = 0;
game.switchgate_pos = 0;
game.balloon_dir = MV_NO_MOVING;
+ game.explosions_delayed = TRUE;
for (i=0; i<4; i++)
{
AmoebaNr[x][y] = 0;
JustStopped[x][y] = 0;
Stop[x][y] = FALSE;
+ ExplodeField[x][y] = EX_NO_EXPLOSION;
}
}
}
}
+ game.version = (tape.playing ? tape.game_version : level.game_version);
game.emulation = (emulate_bd ? EMU_BOULDERDASH :
emulate_sb ? EMU_SOKOBAN :
emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
+ /* dynamically adjust element properties according to game engine version */
+ {
+ static int ep_slippery[] =
+ {
+ EL_BETON,
+ EL_MAUERWERK,
+ EL_MAUER_LEBT,
+ EL_MAUER_X,
+ EL_MAUER_Y,
+ EL_MAUER_XY
+ };
+ static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+
+ for (i=0; i<ep_slippery_num; i++)
+ {
+ if (game.version >= GAME_VERSION_2_0)
+ Elementeigenschaften2[ep_slippery[i]] |= EP_BIT_SLIPPERY_GEMS;
+ else
+ Elementeigenschaften2[ep_slippery[i]] &= ~EP_BIT_SLIPPERY_GEMS;
+ }
+ }
+
if (BorderElement == EL_LEERRAUM)
{
SBX_Left = 0;
DrawAllPlayers();
FadeToFront();
- /* after drawing the level, corect some elements */
-
+ /* after drawing the level, correct some elements */
if (game.timegate_time_left == 0)
CloseAllOpenTimegates();
if (setup.soft_scrolling)
- XCopyArea(display, fieldbuffer, backbuffer, gc,
- FX, FY, SXSIZE, SYSIZE, SX, SY);
+ BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
redraw_mask |= REDRAW_FROM_BACKBUFFER;
/* copy default game door content to main double buffer */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+ BlitBitmap(pix[PIX_DOOR], drawto,
+ DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
if (level_nr < 100)
DrawText(DX + XX_LEVEL, DY + YY_LEVEL,
int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
else
{
- DrawTextExt(drawto, gc, DX + XX_EMERALDS, DY + YY_EMERALDS,
+ DrawTextExt(drawto, DX + XX_EMERALDS, DY + YY_EMERALDS,
int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3);
- XCopyArea(display, drawto, drawto, gc,
- DX + XX_EMERALDS, DY + YY_EMERALDS + 1,
- FONT5_XSIZE * 3, FONT5_YSIZE - 1,
- DX + XX_LEVEL - 1, DY + YY_LEVEL + 1);
+ BlitBitmap(drawto, drawto,
+ DX + XX_EMERALDS, DY + YY_EMERALDS + 1,
+ FONT5_XSIZE * 3, FONT5_YSIZE - 1,
+ DX + XX_LEVEL - 1, DY + YY_LEVEL + 1);
}
DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
MapTapeButtons();
/* copy actual game door content to door double buffer for OpenDoor() */
- XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
- DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+ BlitBitmap(drawto, pix[PIX_DB_DOOR],
+ DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
OpenDoor(DOOR_OPEN_ALL);
- if (setup.sound_music)
- PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
+ if (setup.sound_music && num_bg_loops)
+ PlayMusic(level_nr % num_bg_loops);
- XAutoRepeatOff(display);
+ KeyboardAutoRepeatOff();
if (options.verbose)
{
StopSound(SND_SIRR);
}
+#if 0
FadeSounds();
+#endif
/* Hero disappears */
DrawLevelField(ExitX, ExitY);
{
leveldir_current->handicap_level++;
SaveLevelSetup_SeriesInfo();
-
- if (level_nr < leveldir_current->last_level)
- raise_level = TRUE;
}
+ if (level_editor_test_game)
+ local_player->score = -1; /* no highscore when playing from editor */
+ else if (level_nr < leveldir_current->last_level)
+ raise_level = TRUE; /* advance to next level */
+
if ((hi_pos = NewHiScore()) >= 0)
{
game_status = HALLOFFAME;
}
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_AMOEBE_NASS))
- {
- Feld[oldx][oldy] = Store[oldx][oldy];
- Store[oldx][oldy] = Store2[oldx][oldy] = 0;
- }
+ (Feld[oldx][oldy] == EL_QUICKSAND_EMPTYING ||
+ Feld[oldx][oldy] == EL_MAGIC_WALL_EMPTYING ||
+ Feld[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTYING ||
+ Feld[oldx][oldy] == EL_AMOEBA_DRIPPING))
+ Feld[oldx][oldy] = get_next_element(Feld[oldx][oldy]);
else
Feld[oldx][oldy] = EL_LEERRAUM;
+ Store[oldx][oldy] = Store2[oldx][oldy] = 0;
+
Feld[newx][newy] = EL_LEERRAUM;
MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0;
MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0;
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 (game.explosions_delayed)
+ {
+ ExplodeField[ex][ey] = mode;
+ return;
+ }
+
if (phase == EX_PHASE_START) /* initialize 'Store[][]' field */
{
int center_element = Feld[ex][ey];
if (element == EL_EXPLODING)
element = Store2[x][y];
- if (IS_PLAYER(ex, ey) && !SHIELD_ON(PLAYERINFO(ex, ey)))
+ if (IS_PLAYER(ex, ey) && !PLAYER_PROTECTED(ex, ey))
{
switch(StorePlayer[ex][ey])
{
Store[x][y] = EL_EDELSTEIN_ROT;
else if (element == EL_ERZ_EDEL_LILA)
Store[x][y] = EL_EDELSTEIN_LILA;
+ else if (element == EL_WALL_PEARL)
+ Store[x][y] = EL_PEARL;
+ else if (element == EL_WALL_CRYSTAL)
+ Store[x][y] = EL_CRYSTAL;
else if (!IS_PFORTE(Store[x][y]))
Store[x][y] = EL_LEERRAUM;
int element = Store2[x][y];
if (IS_PLAYER(x, y))
- KillHeroUnlessShield(PLAYERINFO(x, y));
+ KillHeroUnlessProtected(x, y);
else if (IS_EXPLOSIVE(element))
{
Feld[x][y] = Store2[x][y];
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);
}
}
return;
}
- if ((element == EL_BOMBE || element == EL_SP_DISK_ORANGE) &&
+ if ((element == EL_BOMBE ||
+ element == EL_SP_DISK_ORANGE ||
+ element == EL_DX_SUPABOMB) &&
(lastline || object_hit)) /* element is bomb */
{
Bang(x, y);
return;
}
+ else if (element == EL_PEARL)
+ {
+ Feld[x][y] = EL_PEARL_BREAKING;
+ PlaySoundLevel(x, y, SND_KNACK);
+ return;
+ }
if (element == EL_TROPFEN && (lastline || object_hit)) /* acid drop */
{
if (object_hit && IS_PLAYER(x, y+1))
- KillHeroUnlessShield(PLAYERINFO(x, y+1));
+ KillHeroUnlessProtected(x, y+1);
else if (object_hit && smashed == EL_PINGUIN)
Bang(x, y+1);
else
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 */
if (IS_PLAYER(x, y+1))
{
- KillHeroUnlessShield(PLAYERINFO(x, y+1));
+ KillHeroUnlessProtected(x, y+1);
return;
}
else if (smashed == EL_PINGUIN)
return;
}
}
- else if (element == EL_FELSBROCKEN || element == EL_SP_ZONK)
+ 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)
{
if (IS_ENEMY(smashed) ||
smashed == EL_BOMBE || smashed == EL_SP_DISK_ORANGE ||
+ smashed == EL_DX_SUPABOMB ||
smashed == EL_SONDE || smashed == EL_SCHWEIN ||
smashed == EL_DRACHE || smashed == EL_MOLE)
{
RaiseScoreElement(EL_KOKOSNUSS);
return;
}
+ else if (smashed == EL_PEARL)
+ {
+ Feld[x][y+1] = EL_PEARL_BREAKING;
+ PlaySoundLevel(x, y, SND_KNACK);
+ return;
+ }
else if (smashed == EL_DIAMANT)
{
Feld[x][y+1] = EL_LEERRAUM;
/* 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;
sound = SND_KLUMPF;
break;
case EL_FELSBROCKEN:
+ case EL_BD_ROCK:
sound = SND_KLOPF;
break;
case EL_SP_ZONK:
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))
MovDir[x][y] = game.balloon_dir;
MovDelay[x][y] = 0;
}
+ else if (element == EL_SPRING_MOVING)
+ {
+ if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) ||
+ (IN_LEV_FIELD(x, y+1) && IS_FREE(x, y+1)))
+ {
+ Feld[x][y] = EL_SPRING;
+ MovDir[x][y] = MV_NO_MOVING;
+ }
+ MovDelay[x][y] = 0;
+ }
else if (element == EL_ROBOT || element == EL_SONDE || element == EL_PINGUIN)
{
int attr_x = -1, attr_y = -1;
if (IS_FREE(x, y+1))
{
InitMovingField(x, y, MV_DOWN);
- Feld[x][y] = EL_FELSBROCKEN;
- Store[x][y] = EL_MORAST_LEER;
+ Feld[x][y] = EL_QUICKSAND_EMPTYING;
+ Store[x][y] = EL_FELSBROCKEN;
}
else if (Feld[x][y+1] == EL_MORAST_LEER)
{
Feld[x][y] = EL_MORAST_LEER;
Feld[x][y+1] = EL_MORAST_VOLL;
+ Store[x][y+1] = Store[x][y];
+ Store[x][y] = 0;
}
}
- else if (element == EL_FELSBROCKEN && Feld[x][y+1] == EL_MORAST_LEER)
+ else if ((element == EL_FELSBROCKEN || element == EL_BD_ROCK) &&
+ Feld[x][y+1] == EL_MORAST_LEER)
{
InitMovingField(x, y, MV_DOWN);
- Store[x][y] = EL_MORAST_VOLL;
+ Feld[x][y] = EL_QUICKSAND_FILLING;
+ Store[x][y] = element;
}
- 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;
+ Feld[x][y] = EL_MAGIC_WALL_EMPTYING;
+ Store[x][y] = EL_CHANGED(Store[x][y]);
}
- 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;
return;
}
- Feld[x][y] = EL_SIEB_LEER;
- Feld[x][y+1] = EL_SIEB_VOLL;
- Store2[x][y+1] = EL_CHANGED(Store2[x][y]);
- Store2[x][y] = 0;
+ Feld[x][y] = EL_MAGIC_WALL_EMPTY;
+ Feld[x][y+1] = EL_MAGIC_WALL_FULL;
+ Store[x][y+1] = EL_CHANGED(Store[x][y]);
+ Store[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;
+ Feld[x][y] = EL_MAGIC_WALL_BD_EMPTYING;
+ Store[x][y] = EL_CHANGED2(Store[x][y]);
}
- 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;
return;
}
- Feld[x][y] = EL_SIEB2_LEER;
- Feld[x][y+1] = EL_SIEB2_VOLL;
- Store2[x][y+1] = EL_CHANGED2(Store2[x][y]);
- Store2[x][y] = 0;
+ Feld[x][y] = EL_MAGIC_WALL_BD_EMPTY;
+ Feld[x][y+1] = EL_MAGIC_WALL_BD_FULL;
+ Store[x][y+1] = EL_CHANGED2(Store[x][y]);
+ Store[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);
- Store2[x][y+1] = element;
+ Feld[x][y] =
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FILLING :
+ EL_MAGIC_WALL_BD_FILLING);
+ Store[x][y] = element;
}
else if (CAN_SMASH(element) && Feld[x][y+1] == EL_SALZSAEURE)
{
Feld[x][y] = EL_AMOEBING;
Store[x][y] = EL_AMOEBE_NASS;
}
+ /* Store[x][y+1] must be zero, because:
+ (EL_MORAST_VOLL -> EL_FELSBROCKEN): Store[x][y+1] == EL_MORAST_LEER
+ */
+#if 0
#if OLD_GAME_BEHAVIOUR
else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1])
#else
else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1] &&
- !IS_FALLING(x, y+1) && !JustStopped[x][y+1])
+ !IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
+ element != EL_DX_SUPABOMB)
+#endif
+#else
+ else if ((IS_SLIPPERY(Feld[x][y+1]) ||
+ (IS_SLIPPERY_GEMS(Feld[x][y+1]) && IS_GEM(element))) &&
+ !IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
+ element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
#endif
{
boolean left = (x>0 && IS_FREE(x-1, y) &&
if (left || right)
{
- if (left && right && game.emulation != EMU_BOULDERDASH)
+ if (left && right &&
+ (game.emulation != EMU_BOULDERDASH &&
+ element != EL_BD_ROCK && element != EL_EDELSTEIN_BD))
left = !(right = RND(2));
InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
{
int newx, newy;
- if ((element == EL_SONDE || element == EL_BALLOON)
+ if ((element == EL_SONDE || element == EL_BALLOON ||
+ element == EL_SPRING_MOVING)
&& JustBeingPushed(x, y))
return;
Moving2Blocked(x, y, &newx, &newy); /* get next screen position */
if (IS_ENEMY(element) && IS_PLAYER(newx, newy) &&
- !SHIELD_ON(PLAYERINFO(newx, newy)))
+ !PLAYER_PROTECTED(newx, newy))
{
#if 1
- TestIfBadThingHitsHero(x, y);
+ TestIfBadThingRunsIntoHero(x, y, MovDir[x][y]);
return;
#else
/* enemy got the player */
DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
if (DONT_TOUCH(element))
- TestIfBadThingHitsHero(x, y);
+ TestIfBadThingTouchesHero(x, y);
return;
}
int newx = x + dx, newy = y + dy;
int step = (horiz_move ? dx : dy) * TILEX / 8;
- if (element == EL_TROPFEN)
+ if (element == EL_TROPFEN || element == EL_AMOEBA_DRIPPING)
step /= 2;
- else if (Store[x][y] == EL_MORAST_VOLL || Store[x][y] == EL_MORAST_LEER)
+ else if (element == EL_QUICKSAND_FILLING ||
+ element == EL_QUICKSAND_EMPTYING)
step /= 4;
+ else if (element == EL_MAGIC_WALL_FILLING ||
+ element == EL_MAGIC_WALL_BD_FILLING ||
+ element == EL_MAGIC_WALL_EMPTYING ||
+ element == EL_MAGIC_WALL_BD_EMPTYING)
+ step /= 2;
else if (CAN_FALL(element) && horiz_move &&
y < lev_fieldy-1 && IS_BELT(Feld[x][y+1]))
step /= 2;
+ else if (element == EL_SPRING_MOVING)
+ step*=2;
#if OLD_GAME_BEHAVIOUR
else if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element))
}
}
- if (Store[x][y] == EL_MORAST_VOLL)
+ if (element == EL_QUICKSAND_FILLING)
{
- Store[x][y] = 0;
- Feld[newx][newy] = EL_MORAST_VOLL;
- element = EL_MORAST_VOLL;
+ element = Feld[newx][newy] = get_next_element(element);
+ Store[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_MORAST_LEER)
+ else if (element == EL_QUICKSAND_EMPTYING)
{
- Store[x][y] = 0;
- Feld[x][y] = EL_MORAST_LEER;
+ Feld[x][y] = get_next_element(element);
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_SIEB_VOLL)
+ else if (element == EL_MAGIC_WALL_FILLING)
{
- Store[x][y] = 0;
- element = Feld[newx][newy] =
- (game.magic_wall_active ? EL_SIEB_VOLL : EL_SIEB_TOT);
+ element = Feld[newx][newy] = get_next_element(element);
+ if (!game.magic_wall_active)
+ element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD;
+ Store[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_SIEB_LEER)
+ else if (element == EL_MAGIC_WALL_EMPTYING)
{
- Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (game.magic_wall_active ? EL_SIEB_LEER : EL_SIEB_TOT);
+ Feld[x][y] = get_next_element(element);
+ if (!game.magic_wall_active)
+ Feld[x][y] = EL_MAGIC_WALL_DEAD;
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_SIEB2_VOLL)
+ else if (element == EL_MAGIC_WALL_BD_FILLING)
{
- Store[x][y] = 0;
- element = Feld[newx][newy] =
- (game.magic_wall_active ? EL_SIEB2_VOLL : EL_SIEB2_TOT);
+ element = Feld[newx][newy] = get_next_element(element);
+ if (!game.magic_wall_active)
+ element = Feld[newx][newy] = EL_MAGIC_WALL_BD_DEAD;
+ Store[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_SIEB2_LEER)
+ else if (element == EL_MAGIC_WALL_BD_EMPTYING)
{
- Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (game.magic_wall_active ? EL_SIEB2_LEER : EL_SIEB2_TOT);
+ Feld[x][y] = get_next_element(element);
+ if (!game.magic_wall_active)
+ Feld[x][y] = EL_MAGIC_WALL_BD_DEAD;
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_SALZSAEURE)
+ else if (element == EL_AMOEBA_DRIPPING)
{
- Store[x][y] = 0;
- Feld[newx][newy] = EL_SALZSAEURE;
- element = EL_SALZSAEURE;
+ Feld[x][y] = get_next_element(element);
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_AMOEBE_NASS)
+ else if (Store[x][y] == EL_SALZSAEURE)
{
- Store[x][y] = 0;
- Feld[x][y] = EL_AMOEBE_NASS;
+ element = Feld[newx][newy] = EL_SALZSAEURE;
}
+ Store[x][y] = 0;
MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
MovDelay[newx][newy] = 0;
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)))
if (done)
PlaySoundLevel(ax, ay,
- (new_element == EL_FELSBROCKEN ? SND_KLOPF : SND_PLING));
+ (new_element == EL_BD_ROCK ? SND_KLOPF : SND_PLING));
}
void AmoebeWaechst(int x, int y)
if (element == EL_AMOEBE_BD && AmoebaCnt2[new_group_nr] >= 200)
{
- AmoebeUmwandelnBD(newax, neway, EL_FELSBROCKEN);
+ AmoebeUmwandelnBD(newax, neway, EL_BD_ROCK);
return;
}
}
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 */
else
{
- InitMovingField(ax, ay, MV_DOWN);
- Feld[ax][ay] = EL_TROPFEN;
- Store[ax][ay] = EL_AMOEBE_NASS;
+ InitMovingField(ax, ay, MV_DOWN); /* drop dripping out of amoeba */
+ Feld[ax][ay] = EL_AMOEBA_DRIPPING;
+ Store[ax][ay] = EL_TROPFEN;
ContinueMoving(ax, ay);
return;
}
{
MovDelay[x][y]--;
if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawGraphic(SCREENX(x), SCREENY(y), GFX_CRACKINGNUT+3-MovDelay[x][y]/2);
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_CRACKINGNUT + 3 - MovDelay[x][y]/2);
if (!MovDelay[x][y])
{
}
}
+void BreakingPearl(int x, int y)
+{
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 9;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_PEARL_BREAKING + 4 - MovDelay[x][y]/2);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_LEERRAUM;
+ DrawLevelField(x, 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);
}
dest_x = FX + SCREENX(x)*TILEX;
dest_y = FY + SCREENY(y)*TILEY;
- XCopyArea(display, drawto_field, window, gc,
- dest_x, dest_y, TILEX, TILEY, dest_x, dest_y);
+ BlitBitmap(drawto_field, window,
+ dest_x, dest_y, TILEX, TILEY, dest_x, dest_y);
SetDrawtoField(DRAW_DIRECT);
}
}
if (element == EL_SP_BUG)
{
- if (!MovDelay[x][y]) /* start activating buggy base */
+ if (!MovDelay[x][y]) /* wait some time before activating base */
MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
- if (MovDelay[x][y]) /* wait some time before activating base */
+ if (MovDelay[x][y])
{
MovDelay[x][y]--;
if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
if (!MovDelay[x][y]) /* start activating buggy base */
MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND);
- if (MovDelay[x][y]) /* wait some time before activating base */
+ if (MovDelay[x][y])
{
MovDelay[x][y]--;
if (MovDelay[x][y])
}
}
+static void CheckTrap(int x, int y)
+{
+ int element = Feld[x][y];
+
+ if (element == EL_TRAP_INACTIVE)
+ {
+ if (!MovDelay[x][y]) /* wait some time before activating trap */
+ MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
+
+ if (MovDelay[x][y])
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y])
+ return;
+
+ Feld[x][y] = EL_TRAP_ACTIVE;
+ }
+ }
+ else if (element == EL_TRAP_ACTIVE)
+ {
+ int delay = 4;
+ int num_frames = 8;
+
+ if (!MovDelay[x][y]) /* start activating trap */
+ MovDelay[x][y] = num_frames * delay;
+
+ if (MovDelay[x][y])
+ {
+ MovDelay[x][y]--;
+
+ if (MovDelay[x][y])
+ {
+ if (!(MovDelay[x][y] % delay))
+ {
+ int phase = MovDelay[x][y]/delay;
+
+ if (phase >= num_frames/2)
+ phase = num_frames - phase;
+
+ if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ {
+ DrawGraphic(SCREENX(x),SCREENY(y), GFX_TRAP_INACTIVE + phase - 1);
+ ErdreichAnbroeckeln(SCREENX(x), SCREENY(y));
+ }
+ }
+
+ return;
+ }
+
+ Feld[x][y] = EL_TRAP_INACTIVE;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
static void DrawBeltAnimation(int x, int y, int element)
{
int belt_nr = getBeltNrFromElement(element);
SnapField(player, 0, 0);
CheckGravityMovement(player);
+ if (player->MovPos == 0) /* needed for tape.playing */
+ player->last_move_dir = MV_NO_MOVING;
+
if (++player->frame_reset_delay > player->move_delay_value)
player->Frame = 0;
}
{
int el = Feld[jx+dx][jy];
int push_delay = (IS_SB_ELEMENT(el) || el == EL_SONDE ? 2 :
- el == EL_BALLOON ? 0 : 10);
+ (el == EL_BALLOON || el == EL_SPRING) ? 0 : 10);
if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
{
}
}
+static void sleep_milliseconds_x(unsigned long milliseconds_delay)
+{
+ boolean do_busy_waiting = (milliseconds_delay < 5 ? TRUE : FALSE);
+
+#if defined(PLATFORM_MSDOS)
+ /* don't use select() to perform waiting operations under DOS/Windows
+ environment; always use a busy loop for waiting instead */
+ do_busy_waiting = TRUE;
+#endif
+
+
+
+ do_busy_waiting = TRUE;
+
+
+
+ if (do_busy_waiting)
+ {
+ /* we want to wait only a few ms -- if we assume that we have a
+ kernel timer resolution of 10 ms, we would wait far to long;
+ therefore it's better to do a short interval of busy waiting
+ to get our sleeping time more accurate */
+
+ unsigned long base_counter = Counter(), actual_counter = Counter();
+
+ while (actual_counter < base_counter + milliseconds_delay &&
+ actual_counter >= base_counter)
+ actual_counter = Counter();
+ }
+ else
+ {
+#if defined(TARGET_SDL)
+ SDL_Delay(milliseconds_delay);
+#else
+ struct timeval delay;
+
+ delay.tv_sec = milliseconds_delay / 1000;
+ delay.tv_usec = 1000 * (milliseconds_delay % 1000);
+
+ if (select(0, NULL, NULL, NULL, &delay) != 0)
+ Error(ERR_WARN, "sleep_milliseconds(): select() failed");
+#endif
+ }
+}
+
void GameActions()
{
static unsigned long action_delay = 0;
/* ---------- main game synchronization point ---------- */
- WaitUntilDelayReached(&action_delay, action_delay_value);
+
+
+#if 1
+ WaitUntilDelayReached(&action_delay, action_delay_value);
+#else
+ {
+ unsigned long count1 = SDL_GetTicks(), count2, current_ms, test;
+
+ /*
+ WaitUntilDelayReached(&action_delay, action_delay_value);
+ */
+
+ /*
+ SDL_Delay(20);
+ */
+
+ /*
+ sleep_milliseconds_x(20);
+ */
+
+ current_ms = SDL_GetTicks();
+ test = -1;
+ while (current_ms < count1 + 20)
+ {
+ current_ms = SDL_GetTicks(); /* busy wait! */
+
+ if (test != current_ms)
+ {
+ Error(ERR_RETURN, "current_ms == %ld", current_ms);
+ test = current_ms;
+ }
+ }
+
+ count2 = SDL_GetTicks();
+ Error(ERR_RETURN, "delay == %ld", count2 - count1);
+ }
+#endif
+
+
if (network_playing && !network_player_action_received)
{
#endif
*/
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
/* last chance to get network player actions without main loop delay */
HandleNetworking();
#endif
stored_player[i].effective_action = stored_player[i].action;
}
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
if (network_playing)
SendToServer_MovePlayer(summarized_player_action);
#endif
{
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);
- else if (element == EL_EXPLODING)
+#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);
+#if 0
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)
Blurb(x, y);
else if (element == EL_CRACKINGNUT)
NussKnacken(x, y);
+ else if (element == EL_PEARL_BREAKING)
+ BreakingPearl(x, y);
else if (element == EL_AUSGANG_ZU)
AusgangstuerPruefen(x, y);
else if (element == EL_AUSGANG_ACT)
CheckForDragon(x, y);
else if (element == EL_SP_BUG || element == EL_SP_BUG_ACTIVE)
CheckBuggyBase(x, y);
+ else if (element == EL_TRAP_INACTIVE || element == EL_TRAP_ACTIVE)
+ CheckTrap(x, y);
else if (element == EL_SP_TERMINAL)
DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL, 7, 12, ANIM_NORMAL);
else if (element == EL_SP_TERMINAL_ACTIVE)
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_FULL ||
+ element == EL_MAGIC_WALL_EMPTY ||
+ element == EL_MAGIC_WALL_EMPTYING)
{
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_FULL ||
+ element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_EMPTYING)
{
SiebAktivieren(x, y, 2);
sieb = TRUE;
}
}
+#if 1
+ /* 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 (element == EL_EXPLODING)
+ Explode(x, y, Frame[x][y], EX_NORMAL);
+
+ ExplodeField[x][y] = EX_NO_EXPLOSION;
+ }
+
+ game.explosions_delayed = TRUE;
+ }
+
if (game.magic_wall_active)
{
if (!(game.magic_wall_time_left % 4))
{
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);
}
}
}
DrawAllPlayers();
+
+ if (options.debug) /* calculate frames per second */
+ {
+ static unsigned long fps_counter = 0;
+ static int fps_frames = 0;
+ unsigned long fps_delay_ms = Counter() - fps_counter;
+
+ fps_frames++;
+
+ if (fps_delay_ms >= 500) /* calculate fps every 0.5 seconds */
+ {
+ global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
+
+ fps_frames = 0;
+ fps_counter = Counter();
+ }
+
+ redraw_mask |= REDRAW_FPS;
+ }
}
static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y)
int softscroll_offset = (setup.soft_scrolling ? TILEX : 0);
int x, y;
- XCopyArea(display, drawto_field, drawto_field, gc,
- FX + TILEX*(dx == -1) - softscroll_offset,
- FY + TILEY*(dy == -1) - softscroll_offset,
- SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset,
- SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset,
- FX + TILEX*(dx == 1) - softscroll_offset,
- FY + TILEY*(dy == 1) - softscroll_offset);
+ BlitBitmap(drawto_field, drawto_field,
+ FX + TILEX*(dx == -1) - softscroll_offset,
+ FY + TILEY*(dy == -1) - softscroll_offset,
+ SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset,
+ SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset,
+ FX + TILEX*(dx == 1) - softscroll_offset,
+ FY + TILEY*(dy == 1) - softscroll_offset);
if (dx)
{
BuryHero(player);
}
else
- {
-#if 1
- TestIfBadThingHitsHero(new_jx, new_jy);
-#else
- if (player->shield_time_left == 0)
- KillHero(player);
-#endif
- }
+ TestIfHeroRunsIntoBadThing(jx, jy, player->MovDir);
return MF_MOVING;
}
player->last_move_dir = MV_NO_MOVING;
}
- TestIfHeroHitsBadThing(jx, jy);
+ TestIfHeroTouchesBadThing(jx, jy);
if (!player->active)
RemoveHero(player);
ScreenMovDir = MV_NO_MOVING;
}
-void TestIfGoodThingHitsBadThing(int goodx, int goody)
+void TestIfGoodThingHitsBadThing(int goodx, int goody, int move_dir)
{
int i, killx = goodx, killy = goody;
static int xy[4][2] =
{ +1, 0 },
{ 0, +1 }
};
- static int harmless[4] =
+ static int xy_dir[4] =
{
MV_UP,
MV_LEFT,
element = MovingOrBlocked2ElementIfNotLeaving(x, 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(element) && move_dir == xy_dir[i]) ||
+ (DONT_TOUCH(element) && MovDir[x][y] != xy_dir[i]))
{
- if (MovDir[x][y] == harmless[i])
- continue;
-
killx = x;
killy = y;
break;
if (player->shield_active_time_left > 0)
Bang(killx, killy);
- else if (player->shield_passive_time_left == 0)
+ else if (!PLAYER_PROTECTED(goodx, goody))
KillHero(player);
}
else
}
}
-void TestIfBadThingHitsGoodThing(int badx, int bady)
+void TestIfBadThingHitsGoodThing(int badx, int bady, int move_dir)
{
int i, killx = badx, killy = bady;
+ int bad_element = Feld[badx][bady];
static int xy[4][2] =
{
{ 0, -1 },
{ +1, 0 },
{ 0, +1 }
};
- static int harmless[4] =
+ static int xy_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++)
element = Feld[x][y];
- if (IS_PLAYER(x, y))
- {
- killx = x;
- killy = y;
- break;
- }
- else if (element == EL_PINGUIN)
+ /* 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) && move_dir == xy_dir[i]) ||
+ (DONT_TOUCH(bad_element) && MovDir[x][y] != xy_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(x, y))
+ {
+ struct PlayerInfo *player = PLAYERINFO(x, y);
- killx = x;
- killy = y;
- break;
+ if (bad_element == EL_ROBOT && player->last_move_dir)
+ continue; /* robot does not kill player if he moves */
+
+ killx = x;
+ killy = y;
+ break;
+ }
+ else if (element == EL_PINGUIN &&
+ (MovDir[x][y] != xy_dir[i] || !IS_MOVING(x, y)))
+ {
+ killx = x;
+ killy = y;
+ break;
+ }
}
}
{
struct PlayerInfo *player = PLAYERINFO(killx, killy);
+#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[badx][bady] == EL_ROBOT && player->last_move_dir &&
+ newx != badx && newy != bady)
+ ; /* robot does not kill player if he moves */
+ else
+ printf("-> %d\n", player->MovDir);
+
+ if (Feld[badx][bady] == EL_ROBOT && player->last_move_dir &&
+ newx != badx && newy != bady)
+ ; /* robot does not kill player if he moves */
+ else
+ ;
+#endif
+
if (player->shield_active_time_left > 0)
Bang(badx, bady);
- else if (player->shield_passive_time_left == 0)
+ else if (!PLAYER_PROTECTED(killx, killy))
KillHero(player);
}
else
}
}
-void TestIfHeroHitsBadThing(int x, int y)
+void TestIfHeroTouchesBadThing(int x, int y)
+{
+ TestIfGoodThingHitsBadThing(x, y, MV_NO_MOVING);
+}
+
+void TestIfHeroRunsIntoBadThing(int x, int y, int move_dir)
{
- TestIfGoodThingHitsBadThing(x, y);
+ TestIfGoodThingHitsBadThing(x, y, move_dir);
}
-void TestIfBadThingHitsHero(int x, int y)
+void TestIfBadThingTouchesHero(int x, int y)
{
- TestIfBadThingHitsGoodThing(x, y);
+ TestIfBadThingHitsGoodThing(x, y, MV_NO_MOVING);
}
-void TestIfFriendHitsBadThing(int x, int y)
+void TestIfBadThingRunsIntoHero(int x, int y, int move_dir)
{
- TestIfGoodThingHitsBadThing(x, y);
+ TestIfBadThingHitsGoodThing(x, y, move_dir);
}
-void TestIfBadThingHitsFriend(int x, int y)
+void TestIfFriendTouchesBadThing(int x, int y)
{
- TestIfBadThingHitsGoodThing(x, y);
+ TestIfGoodThingHitsBadThing(x, y, MV_NO_MOVING);
}
-void TestIfBadThingHitsOtherBadThing(int badx, int bady)
+void TestIfBadThingTouchesFriend(int x, int y)
+{
+ TestIfBadThingHitsGoodThing(x, y, MV_NO_MOVING);
+}
+
+void TestIfBadThingTouchesOtherBadThing(int badx, int bady)
{
int i, killx = badx, killy = bady;
static int xy[4][2] =
BuryHero(player);
}
-static void KillHeroUnlessShield(struct PlayerInfo *player)
+static void KillHeroUnlessProtected(int x, int y)
{
- if (!SHIELD_ON(player))
- KillHero(player);
+ if (!PLAYER_PROTECTED(x, y))
+ KillHero(PLAYERINFO(x, y));
}
void BuryHero(struct PlayerInfo *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)
if (IS_MOVING(x, y) || IS_PLAYER(x, y))
return MF_NO_ACTION;
+ if (IS_TUBE(Feld[jx][jy]))
+ {
+ int i = 0;
+ int tube_leave_directions[][2] =
+ {
+ { EL_TUBE_CROSS, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERTICAL, MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT },
+ { EL_TUBE_VERT_LEFT, MV_LEFT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERT_RIGHT, MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZ_UP, MV_LEFT | MV_RIGHT | MV_UP },
+ { EL_TUBE_HORIZ_DOWN, MV_LEFT | MV_RIGHT | MV_DOWN },
+ { EL_TUBE_LEFT_UP, MV_LEFT | MV_UP },
+ { EL_TUBE_LEFT_DOWN, MV_LEFT | MV_DOWN },
+ { EL_TUBE_RIGHT_UP, MV_RIGHT | MV_UP },
+ { EL_TUBE_RIGHT_DOWN, MV_RIGHT | MV_DOWN },
+ { -1, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }
+ };
+
+ while (tube_leave_directions[i][0] != Feld[jx][jy])
+ {
+ i++;
+ if (tube_leave_directions[i][0] == -1) /* should not happen */
+ break;
+ }
+
+ if (!(tube_leave_directions[i][1] & move_direction))
+ return MF_NO_ACTION; /* tube has no opening in this direction */
+ }
+
element = Feld[x][y];
switch (element)
case EL_ERDREICH:
case EL_SAND_INVISIBLE:
+ case EL_TRAP_INACTIVE:
Feld[x][y] = EL_LEERRAUM;
PlaySoundLevel(x, y, SND_SCHLURF);
break;
case EL_EDELSTEIN_LILA:
case EL_DIAMANT:
case EL_SP_INFOTRON:
+ case EL_PEARL:
+ case EL_CRYSTAL:
RemoveField(x, y);
- local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 : 1);
+ local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 :
+ element == EL_PEARL ? 5 :
+ element == EL_CRYSTAL ? 8 : 1);
if (local_player->gems_still_needed < 0)
local_player->gems_still_needed = 0;
RaiseScoreElement(element);
RemoveField(x, y);
player->key[key_nr] = TRUE;
RaiseScoreElement(EL_SCHLUESSEL);
- DrawMiniGraphicExt(drawto, gc,
- DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
- GFX_SCHLUESSEL1+key_nr);
- DrawMiniGraphicExt(window, gc,
- DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
- GFX_SCHLUESSEL1+key_nr);
+ DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1 + key_nr);
+ DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1 + key_nr);
PlaySoundLevel(x, y, SND_PONG);
break;
}
RemoveField(x, y);
player->key[key_nr] = TRUE;
RaiseScoreElement(EL_SCHLUESSEL);
- DrawMiniGraphicExt(drawto, gc,
- DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
- GFX_SCHLUESSEL1+key_nr);
- DrawMiniGraphicExt(window, gc,
- DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
- GFX_SCHLUESSEL1+key_nr);
+ DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1 + key_nr);
+ DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1 + key_nr);
PlaySoundLevel(x, y, SND_PONG);
break;
}
break;
case EL_FELSBROCKEN:
+ case EL_BD_ROCK:
case EL_BOMBE:
+ case EL_DX_SUPABOMB:
case EL_KOKOSNUSS:
case EL_ZEIT_LEER:
case EL_SP_ZONK:
case EL_SP_DISK_ORANGE:
+ case EL_SPRING:
if (dy || mode == DF_SNAP)
return MF_NO_ACTION;
if (player->push_delay == 0)
player->push_delay = FrameCounter;
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
- !tape.playing)
+ !tape.playing && element != EL_SPRING)
return MF_NO_ACTION;
RemoveField(x, y);
Feld[x+dx][y+dy] = element;
- player->push_delay_value = 2+RND(8);
+ if (element == EL_SPRING)
+ {
+ Feld[x+dx][y+dy] = EL_SPRING_MOVING;
+ MovDir[x+dx][y+dy] = move_direction;
+ }
+
+ player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));
DrawLevelField(x+dx, y+dy);
- if (element == EL_FELSBROCKEN)
+ if (element == EL_FELSBROCKEN || element == EL_BD_ROCK)
PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
else if (element == EL_KOKOSNUSS)
PlaySoundLevel(x+dx, y+dy, SND_KNURK);
DOUBLE_PLAYER_SPEED(player);
PlaySoundLevel(x, y, SND_GATE);
+ break;
+ case EL_TUBE_CROSS:
+ case EL_TUBE_VERTICAL:
+ case EL_TUBE_HORIZONTAL:
+ case EL_TUBE_VERT_LEFT:
+ case EL_TUBE_VERT_RIGHT:
+ case EL_TUBE_HORIZ_UP:
+ case EL_TUBE_HORIZ_DOWN:
+ case EL_TUBE_LEFT_UP:
+ case EL_TUBE_LEFT_DOWN:
+ case EL_TUBE_RIGHT_UP:
+ case EL_TUBE_RIGHT_DOWN:
+ {
+ int i = 0;
+ int tube_enter_directions[][2] =
+ {
+ { EL_TUBE_CROSS, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERTICAL, MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT },
+ { EL_TUBE_VERT_LEFT, MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERT_RIGHT, MV_LEFT | MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZ_UP, MV_LEFT | MV_RIGHT | MV_DOWN },
+ { EL_TUBE_HORIZ_DOWN, MV_LEFT | MV_RIGHT | MV_UP },
+ { EL_TUBE_LEFT_UP, MV_RIGHT | MV_DOWN },
+ { EL_TUBE_LEFT_DOWN, MV_RIGHT | MV_UP },
+ { EL_TUBE_RIGHT_UP, MV_LEFT | MV_DOWN },
+ { EL_TUBE_RIGHT_DOWN, MV_LEFT | MV_UP },
+ { -1, MV_NO_MOVING }
+ };
+
+ while (tube_enter_directions[i][0] != element)
+ {
+ i++;
+ if (tube_enter_directions[i][0] == -1) /* should not happen */
+ break;
+ }
+
+ if (!(tube_enter_directions[i][1] & move_direction))
+ return MF_NO_ACTION; /* tube has no opening in this direction */
+ }
break;
case EL_AUSGANG_ZU:
volume = PSND_MAX_VOLUME;
-#ifndef MSDOS
+#if !defined(PLATFORM_MSDOS)
stereo = (sx - SCR_FIELDX/2) * 12;
#else
stereo = PSND_MIDDLE + (2 * sx - (SCR_FIELDX - 1)) * 5;
for (i=0; i<NUM_GAME_BUTTONS; i++)
{
- Pixmap gd_pixmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = pix[PIX_DOOR];
struct GadgetInfo *gi;
int button_type;
boolean checked;
GDI_TYPE, button_type,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_CHECKED, checked,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y1,
- GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y2,
- GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+ GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y1,
+ GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y2,
+ GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleGameButtons,
GDI_END);
Request("Do you really want to quit the game ?",
REQ_ASK | REQ_STAY_CLOSED))
{
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
if (options.network)
SendToServer_StopPlaying();
else
case GAME_CTRL_ID_PAUSE:
if (options.network)
{
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
if (tape.pausing)
SendToServer_ContinuePlaying();
else
case GAME_CTRL_ID_PLAY:
if (tape.pausing)
{
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
if (options.network)
SendToServer_ContinuePlaying();
else
if (setup.sound_music)
{
setup.sound_music = FALSE;
- FadeSound(background_loop[level_nr % num_bg_loops]);
+ FadeMusic();
}
- else if (sound_loops_allowed)
+ else if (audio.loops_available)
{
setup.sound = setup.sound_music = TRUE;
- PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
+ if (num_bg_loops)
+ PlayMusic(level_nr % num_bg_loops);
}
break;
case SOUND_CTRL_ID_LOOPS:
if (setup.sound_loops)
setup.sound_loops = FALSE;
- else if (sound_loops_allowed)
+ else if (audio.loops_available)
setup.sound = setup.sound_loops = TRUE;
break;
case SOUND_CTRL_ID_SIMPLE:
if (setup.sound_simple)
setup.sound_simple = FALSE;
- else if (sound_status==SOUND_AVAILABLE)
+ else if (audio.sound_available)
setup.sound = setup.sound_simple = TRUE;
break;
projects / rocksndiamonds.git / blobdiff