rnd-20030106-2-src

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 20f71882790df95fe0b0c5f4f02ec078789565cd..43d45e484c27bad89df3caea2833eabfc520b558 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -2013,6 +2013,7 @@ struct ConfigInfo image_config[] =
   { "satellite.moving.ypos",                   "9"                     },
   { "satellite.moving.frames",                 "8"                     },
   { "satellite.moving.delay",                  "2"                     },
+  { "satellite.moving.global_sync",            "1"                     },
 
   { "flames_left1",                            "RocksHeroes.pcx"       },
   { "flames_left1.xpos",                       "8"                     },

diff --git a/src/conftime.h b/src/conftime.h
index 5f9f105d4f3701f82e10174ddacf1bb55450ca7f..1aa23861e6c2274672e578b84a823894cec347f9 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-01-06 02:55]"
+#define COMPILE_DATE_STRING "[2003-01-06 03:26]"

diff --git a/src/main.h b/src/main.h
index 72d6c23daefb3c227402e50aa81d391d7a2fd0b2..513faf157b8f9a220b7f4ce4a39929c03f0d94e9 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1431,7 +1431,7 @@
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
-#define PROGRAM_RIGHTS_STRING  "Copyright ^1995-2002 by"
+#define PROGRAM_RIGHTS_STRING  "Copyright ^1995-2003 by"
 #define PROGRAM_DOS_PORT_STRING        "DOS port done by Guido Schulz"
 #define PROGRAM_IDENT_STRING   PROGRAM_VERSION_STRING " " TARGET_STRING
 #define WINDOW_TITLE_STRING    PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING

diff --git a/src/tools.c b/src/tools.c
index d6be4813de6f8ca061360d42f66cbe1932a9f71f..2f3ce540b2998eec2afea3d59f8c38cb023cb204 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -666,9 +666,10 @@ void DrawPlayer(struct PlayerInfo *player)
   {
     int px = SCREENX(next_jx), py = SCREENY(next_jy);
 
-    if (element == EL_SOKOBAN_FIELD_EMPTY ||
-       Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
-      DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT, 0,
+    if ((sxx || syy) &&
+       (element == EL_SOKOBAN_FIELD_EMPTY ||
+        Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL))
+      DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0,
                                 NO_CUTTING);
     else
     {
@@ -678,7 +679,7 @@ void DrawPlayer(struct PlayerInfo *player)
       int frame = 0;
 #endif
 
-      if (sxx && IS_PUSHABLE(element))
+      if ((sxx || syy) && IS_PUSHABLE(element))
       {
        graphic = el_dir_act2img(element, player->MovDir, GFX_ACTION_MOVING);
 #if 1
@@ -732,7 +733,7 @@ void DrawPlayer(struct PlayerInfo *player)
 #endif
 
     if (game.emulation == EMU_SUPAPLEX)
-      DrawGraphic(sx, sy, GFX_SP_DISK_RED, 0);
+      DrawGraphic(sx, sy, IMG_SP_DISK_RED, 0);
     else
       DrawGraphicThruMask(sx, sy, graphic, frame);
   }