From: Holger Schemel <info@artsoft.org>
Date: Mon, 6 Jan 2003 02:41:07 +0000 (+0100)
Subject: rnd-20030106-2-src
X-Git-Tag: 3.0.0^2~187
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c4e2a358613670823800b1bfe5bee211e62dc7b2;p=rocksndiamonds.git

rnd-20030106-2-src
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 20f71882..43d45e48 100644
--- 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 5f9f105d..1aa23861 100644
--- 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 72d6c23d..513faf15 100644
--- 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 d6be4813..2f3ce540 100644
--- 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);
   }