rnd-20030620-1-src

diff --git a/src/conftime.h b/src/conftime.h
index 3a1d5c842d080e4f95b25110dc8aad6bc0e23447..6b3c6c0e3540771b253520e5087c15b1f3b577ed 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-06-19 03:25]"
+#define COMPILE_DATE_STRING "[2003-06-20 01:43]"

diff --git a/src/files.c b/src/files.c
index 83e7b0bbc5e561e50ee0a1b2f89c8f2f5bf3967b..19f536d9f2498e18bdbe9ca11b36211757fb37ba 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -101,6 +101,12 @@ static void setLevelInfoToDefaults()
 
     element_info[element].use_gfx_element = FALSE;
     element_info[element].gfx_element = EL_EMPTY_SPACE;
 
     element_info[element].use_gfx_element = FALSE;
     element_info[element].gfx_element = EL_EMPTY_SPACE;

+
+    element_info[element].push_delay_fixed = 2;                /* special default */
+    element_info[element].push_delay_random = 8;       /* special default */
+    element_info[element].move_delay_fixed = 0;
+    element_info[element].move_delay_random = 0;
+

     element_info[element].move_pattern = MV_ALL_DIRECTIONS;
     element_info[element].move_direction_initial = MV_NO_MOVING;
     element_info[element].move_stepsize = TILEX / 8;
     element_info[element].move_pattern = MV_ALL_DIRECTIONS;
     element_info[element].move_direction_initial = MV_NO_MOVING;
     element_info[element].move_stepsize = TILEX / 8;


@@ -1208,6 +1214,10 @@ void LoadTapeFromFilename(char *filename)
   fclose(file);
 
   tape.length_seconds = GetTapeLength();
   fclose(file);
 
   tape.length_seconds = GetTapeLength();

+
+#if 0
+  printf("tape version: %d\n", tape.game_version);
+#endif

 }
 
 void LoadTape(int level_nr)
 }
 
 void LoadTape(int level_nr)

diff --git a/src/game.c b/src/game.c
index 2069cb1d35397dedc14306ddfea9fe845a658514..88f2c53c32bbd122c54a991945d68e413a513040 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -828,7 +828,6 @@ void InitGame()
     player->actual_frame_counter = 0;
 
     player->last_move_dir = MV_NO_MOVING;
     player->actual_frame_counter = 0;
 
     player->last_move_dir = MV_NO_MOVING;

-    player->is_moving = FALSE;

 
     player->is_moving = FALSE;
     player->is_waiting = FALSE;
 
     player->is_moving = FALSE;
     player->is_waiting = FALSE;


@@ -1505,8 +1504,10 @@ static void ResetGfxAnimation(int x, int y)
 void InitMovingField(int x, int y, int direction)
 {
   int element = Feld[x][y];
 void InitMovingField(int x, int y, int direction)
 {
   int element = Feld[x][y];

-  int newx = x + (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
-  int newy = y + (direction == MV_UP   ? -1 : direction == MV_DOWN  ? +1 : 0);
+  int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
+  int dy = (direction == MV_UP   ? -1 : direction == MV_DOWN  ? +1 : 0);
+  int newx = x + dx;
+  int newy = y + dy;

 
   if (!JustStopped[x][y] || direction != MovDir[x][y])
     ResetGfxAnimation(x, y);
 
   if (!JustStopped[x][y] || direction != MovDir[x][y])
     ResetGfxAnimation(x, y);


@@ -3313,11 +3314,17 @@ void StartMoving(int x, int y)
       GfxAction[x][y + 1] = ACTION_ACTIVE;
 #endif
     }
       GfxAction[x][y + 1] = ACTION_ACTIVE;
 #endif
     }

+#if 1

     else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED &&
             JustStopped[x][y])
     {
     else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED &&
             JustStopped[x][y])
     {

+      /*
+      printf("::: %d\n", MovDir[x][y]);
+      */
+

       Impact(x, y);
     }
       Impact(x, y);
     }

+#endif

     else if (IS_FREE(x, y + 1) && element == EL_SPRING && use_spring_bug)
     {
       if (MovDir[x][y] == MV_NO_MOVING)
     else if (IS_FREE(x, y + 1) && element == EL_SPRING && use_spring_bug)
     {
       if (MovDir[x][y] == MV_NO_MOVING)


@@ -3351,7 +3358,7 @@ void StartMoving(int x, int y)
             element != EL_DX_SUPABOMB)
 #endif
 #else
             element != EL_DX_SUPABOMB)
 #endif
 #else

-    else if ((IS_SLIPPERY(Feld[x][y + 1]) ||
+    else if (((IS_SLIPPERY(Feld[x][y + 1]) && !IS_PLAYER(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_SP_DISK_ORANGE)
              (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_SP_DISK_ORANGE)


@@ -3371,6 +3378,11 @@ void StartMoving(int x, int y)
 
        InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
        started_moving = TRUE;
 
        InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
        started_moving = TRUE;

+
+#if 0
+       if (element == EL_BOMB)
+         printf("::: SLIP DOWN [%d]\n", FrameCounter);
+#endif

       }
     }
     else if (IS_BELT_ACTIVE(Feld[x][y + 1]))
       }
     }
     else if (IS_BELT_ACTIVE(Feld[x][y + 1]))


@@ -3778,6 +3790,8 @@ void ContinueMoving(int x, int y)
   int horiz_move = (dx != 0);
   int newx = x + dx, newy = y + dy;
   int step = (horiz_move ? dx : dy) * TILEX / MOVE_DELAY_NORMAL_SPEED;
   int horiz_move = (dx != 0);
   int newx = x + dx, newy = y + dy;
   int step = (horiz_move ? dx : dy) * TILEX / MOVE_DELAY_NORMAL_SPEED;

+  struct PlayerInfo *player = (IS_PLAYER(x, y) ? PLAYERINFO(x, y) : NULL);
+  boolean pushing = (player != NULL && player->Pushing && player->is_moving);

 
   if (element == EL_AMOEBA_DROP || element == EL_AMOEBA_DROPPING)
     step /= 2;
 
   if (element == EL_AMOEBA_DROP || element == EL_AMOEBA_DROPPING)
     step /= 2;


@@ -3804,6 +3818,16 @@ void ContinueMoving(int x, int y)
 
   MovPos[x][y] += step;
 
 
   MovPos[x][y] += step;
 

+#if 1
+  if (pushing)         /* special case: moving object pushed by player */
+    MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->GfxPos));
+#endif
+
+#if 0
+  if (pushing)
+    printf("::: OOPS! pushing '%s'\n", element_info[element].token_name);
+#endif
+

   if (ABS(MovPos[x][y]) >= TILEX)      /* object reached its destination */
   {
     Feld[x][y] = EL_EMPTY;
   if (ABS(MovPos[x][y]) >= TILEX)      /* object reached its destination */
   {
     Feld[x][y] = EL_EMPTY;


@@ -3917,8 +3941,14 @@ void ContinueMoving(int x, int y)
     DrawLevelField(x, y);
     DrawLevelField(newx, newy);
 
     DrawLevelField(x, y);
     DrawLevelField(newx, newy);
 

-    Stop[newx][newy] = TRUE;
-    JustStopped[newx][newy] = 3;
+#if 0
+    if (game.engine_version >= RELEASE_IDENT(2,2,0,7) || !pushing)
+#endif
+      Stop[newx][newy] = TRUE; /* ignore this element until the next frame */
+#if 1
+    if (!pushing)
+#endif
+      JustStopped[newx][newy] = 3;

 
     if (DONT_TOUCH(element))   /* object may be nasty to player or others */
     {
 
     if (DONT_TOUCH(element))   /* object may be nasty to player or others */
     {


@@ -4961,16 +4991,7 @@ static void CheckPlayerElementChange(int x, int y, int element,
   if (!CAN_CHANGE(element) || !HAS_CHANGE_EVENT(element, trigger_event))
     return;
 
   if (!CAN_CHANGE(element) || !HAS_CHANGE_EVENT(element, trigger_event))
     return;
 

-  if (trigger_event == CE_PUSHED_BY_PLAYER)
-  {
-#if 0
-    /* !!! does not work -- debug !!! */
-    ChangeDelay[x][y] = 2;     /* give one frame (+1) to start pushing */
-    ChangeElement(x, y);
-#endif
-  }
-  else
-    ChangeElementDoIt(x, y, element_info[element].change.successor);
+  ChangeElementDoIt(x, y, element_info[element].change.successor);

 }
 
 static void PlayerActions(struct PlayerInfo *player, byte player_action)
 }
 
 static void PlayerActions(struct PlayerInfo *player, byte player_action)


@@ -5139,6 +5160,30 @@ void GameActions()
     stored_player[i].Frame++;
 #endif
 
     stored_player[i].Frame++;
 #endif
 

+#if 1
+  if (game.engine_version < RELEASE_IDENT(2,2,0,7))
+  {
+    for (i=0; i<MAX_PLAYERS; i++)
+    {
+      struct PlayerInfo *player = &stored_player[i];
+      int x = player->jx;
+      int y = player->jy;
+
+      if (player->active && player->Pushing && player->is_moving &&
+         IS_MOVING(x, y))
+      {
+       ContinueMoving(x, y);
+
+       /* continue moving after pushing (this is actually a bug) */
+       if (!IS_MOVING(x, y))
+       {
+         Stop[x][y] = FALSE;
+       }
+      }
+    }
+  }
+#endif
+

   for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
   {
     Stop[x][y] = FALSE;
   for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
   {
     Stop[x][y] = FALSE;


@@ -6328,7 +6373,14 @@ int DigField(struct PlayerInfo *player,
   }
 
   if (IS_MOVING(x, y) || IS_PLAYER(x, y))
   }
 
   if (IS_MOVING(x, y) || IS_PLAYER(x, y))

+  {
+#if 0
+    if (FrameCounter == 437)
+      printf("::: ---> IS_MOVING %d\n", MovDir[x][y]);
+#endif
+

     return MF_NO_ACTION;
     return MF_NO_ACTION;

+  }

 
 #if 0
   if (IS_TUBE(Feld[jx][jy]) || IS_TUBE(Back[jx][jy]))
 
 #if 0
   if (IS_TUBE(Feld[jx][jy]) || IS_TUBE(Back[jx][jy]))


@@ -6722,8 +6774,14 @@ int DigField(struct PlayerInfo *player,
       if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
        return MF_NO_ACTION;
 
       if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
        return MF_NO_ACTION;
 

+

       if (player->push_delay == 0)
        player->push_delay = FrameCounter;
       if (player->push_delay == 0)
        player->push_delay = FrameCounter;

+
+#if 0
+      printf("want push... %d [%d]\n", FrameCounter, player->push_delay_value);
+#endif
+

 #if 0
       if (!FrameReached(&player->push_delay, player->push_delay_value) &&
          !tape.playing &&
 #if 0
       if (!FrameReached(&player->push_delay, player->push_delay_value) &&
          !tape.playing &&


@@ -6743,10 +6801,22 @@ int DigField(struct PlayerInfo *player,
       }
       else
       {
       }
       else
       {

+#if 1
+       InitMovingField(x, y, (dx < 0 ? MV_LEFT :
+                              dx > 0 ? MV_RIGHT :
+                              dy < 0 ? MV_UP : MV_DOWN));
+       MovPos[x][y] = (dx != 0 ? dx : dy);
+#else

        RemoveField(x, y);
        Feld[x + dx][y + dy] = element;
        RemoveField(x, y);
        Feld[x + dx][y + dy] = element;

+#endif

       }
 
       }
 

+#if 0
+      printf("pushing %d/%d ... %d [%d]\n", dx, dy,
+            FrameCounter, player->push_delay_value);
+#endif
+

       if (element == EL_SPRING)
       {
        Feld[x + dx][y + dy] = EL_SPRING;
       if (element == EL_SPRING)
       {
        Feld[x + dx][y + dy] = EL_SPRING;


@@ -7123,8 +7193,15 @@ int DigField(struct PlayerInfo *player,
            !(tape.playing && tape.file_version < FILE_VERSION_2_0))
          return MF_NO_ACTION;
 
            !(tape.playing && tape.file_version < FILE_VERSION_2_0))
          return MF_NO_ACTION;
 

+#if 1
+       InitMovingField(x, y, (dx < 0 ? MV_LEFT :
+                              dx > 0 ? MV_RIGHT :
+                              dy < 0 ? MV_UP : MV_DOWN));
+       MovPos[x][y] = (dx != 0 ? dx : dy);
+#else

        RemoveField(x, y);
        Feld[x + dx][y + dy] = element;
        RemoveField(x, y);
        Feld[x + dx][y + dy] = element;

+#endif

 
 #if 1
        if (game.engine_version < RELEASE_IDENT(2,2,0,7))
 
 #if 1
        if (game.engine_version < RELEASE_IDENT(2,2,0,7))


@@ -7137,7 +7214,7 @@ int DigField(struct PlayerInfo *player,
        PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
 
        CheckTriggeredElementChange(element, CE_OTHER_PUSHING);
        PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
 
        CheckTriggeredElementChange(element, CE_OTHER_PUSHING);

-       CheckPlayerElementChange(x, y, element, CE_PUSHED_BY_PLAYER);
+       CheckPlayerElementChange(x + dx, y + dy, element, CE_PUSHED_BY_PLAYER);

 
        break;
       }
 
        break;
       }

diff --git a/src/init.c b/src/init.c
index c614643e8d2bd8adf1e10c6bdd181f61d423f076..6d32cd3b46158d149470e58a04e890ffd37a147e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -2659,6 +2659,7 @@ void InitElementPropertiesEngine(int engine_version)
                  engine_version > VERSION_IDENT(2,0,1)));
   }
 
                  engine_version > VERSION_IDENT(2,0,1)));
   }
 

+#if 0

   /* dynamically adjust element properties according to game engine version */
 #if 0
   if (engine_version < RELEASE_IDENT(2,2,0,7))
   /* dynamically adjust element properties according to game engine version */
 #if 0
   if (engine_version < RELEASE_IDENT(2,2,0,7))


@@ -2672,6 +2673,7 @@ void InitElementPropertiesEngine(int engine_version)
       element_info[element].push_delay_random = 8;
     }
   }
       element_info[element].push_delay_random = 8;
     }
   }

+#endif

 }
 
 static void InitGlobal()
 }
 
 static void InitGlobal()

diff --git a/src/tape.c b/src/tape.c
index 40a5126b160dbcff66f561b2c847e1bc91f81fa6..3aa2282b2edd6b1c0b5d67139f73b7757511ee15 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -316,6 +316,11 @@ void TapeErase()
   tape.game_version = GAME_VERSION_ACTUAL;
   tape.engine_version = level.game_version;
 
   tape.game_version = GAME_VERSION_ACTUAL;
   tape.engine_version = level.game_version;
 

+#if 0
+  printf("::: tape.engine_version = level.game_version = %d \n",
+        level.game_version);
+#endif
+

   for(i=0; i<MAX_PLAYERS; i++)
     tape.player_participates[i] = FALSE;
 }
   for(i=0; i<MAX_PLAYERS; i++)
     tape.player_participates[i] = FALSE;
 }

diff --git a/src/tools.c b/src/tools.c
index 3595839db2e82a9aa898a4ca67e10d5e16bcc966..867ee3c0f394bb2162a9368f474773d615ac1c5a 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -707,7 +707,12 @@ void DrawPlayer(struct PlayerInfo *player)
                                 NO_CUTTING);
     else
     {
                                 NO_CUTTING);
     else
     {

+#if 0
+      int element = Feld[jx][jy];
+#else

       int element = Feld[next_jx][next_jy];
       int element = Feld[next_jx][next_jy];

+#endif
+

       int graphic = el2img(element);
       int frame = 0;
 
       int graphic = el2img(element);
       int frame = 0;