From: Holger Schemel <info@artsoft.org>
Date: Tue, 16 Feb 2010 16:46:36 +0000 (+0100)
Subject: rnd-20100216-3-src
X-Git-Tag: 3.3.0.0^2~34
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=b1750ae5f6404a4faacc38425e0b31c29ea12c37

rnd-20100216-3-src
* done integrating R'n'D graphics engine into file "Zonk.c"
---

diff --git a/ChangeLog b/ChangeLog
index c1f4a80d..7bab90c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	* fixed bug in native Supaplex engine that broke several demo solutions
 	* done integrating R'n'D graphics engine into file "SnikSnaks.c"
 	* done integrating R'n'D graphics engine into file "Electrons.c"
+	* done integrating R'n'D graphics engine into file "Zonk.c"
 
 2010-02-14
 	* done integrating R'n'D graphics engine into file "Murphy.c"
diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 70a30912..b781128a 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -292,26 +292,26 @@ struct ConfigInfo image_config[] =
   { "sp_zonk.moving.left.xpos",			"0"			},
   { "sp_zonk.moving.left.ypos",			"6"			},
   { "sp_zonk.moving.left.frames",		"4"			},
-  { "sp_zonk.moving.left.delay",		"2"			},
+  { "sp_zonk.moving.left.delay",		"1"			},
   { "sp_zonk.moving.left.anim_mode",		"reverse"		},
   { "sp_zonk.moving.right",			"RocksSP.pcx"		},
   { "sp_zonk.moving.right.xpos",		"0"			},
   { "sp_zonk.moving.right.ypos",		"6"			},
   { "sp_zonk.moving.right.frames",		"4"			},
   { "sp_zonk.moving.right.start_frame",		"1"			},
-  { "sp_zonk.moving.right.delay",		"2"			},
+  { "sp_zonk.moving.right.delay",		"1"			},
   { "sp_zonk.pushing.left",			"RocksSP.pcx"		},
   { "sp_zonk.pushing.left.xpos",		"0"			},
   { "sp_zonk.pushing.left.ypos",		"6"			},
   { "sp_zonk.pushing.left.frames",		"4"			},
-  { "sp_zonk.pushing.left.delay",		"2"			},
+  { "sp_zonk.pushing.left.delay",		"1"			},
   { "sp_zonk.pushing.left.anim_mode",		"reverse"		},
   { "sp_zonk.pushing.right",			"RocksSP.pcx"		},
   { "sp_zonk.pushing.right.xpos",		"0"			},
   { "sp_zonk.pushing.right.ypos",		"6"			},
   { "sp_zonk.pushing.right.frames",		"4"			},
   { "sp_zonk.pushing.right.start_frame",	"1"			},
-  { "sp_zonk.pushing.right.delay",		"2"			},
+  { "sp_zonk.pushing.right.delay",		"1"			},
 
   { "sp_base",					"RocksSP.pcx"		},
   { "sp_base.xpos",				"2"			},
diff --git a/src/conftime.h b/src/conftime.h
index 900d4568..f6b24ec4 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2010-02-16 17:12"
+#define COMPILE_DATE_STRING "2010-02-16 17:44"
diff --git a/src/game_sp/Zonk.c b/src/game_sp/Zonk.c
index 0c00be8e..d6a31acc 100644
--- a/src/game_sp/Zonk.c
+++ b/src/game_sp/Zonk.c
@@ -131,8 +131,13 @@ loc_g_0DE8: // zonk comes falling from above
   X = GetStretchX(si);
   Y = GetStretchY(si - FieldWidth);
   dx = bl & 0x7;
+#if 1
+  StretchedSprites.BltImg(X, Y, aniSpace, 0);
+  StretchedSprites.BltImg(X, Y + TwoPixels * (dx + 1), aniZonk, dx);
+#else
   StretchedSprites.BltEx(X, Y, 0);
   StretchedSprites.BltEx(X, Y + TwoPixels * (dx + 1), fiZonk);
+#endif
   // +++++++++++++++++++++++++++++++++++++++++++++++++++++
   bl = HighByte(PlayField16[si]) + 1;
   if (bl == 0x16)
@@ -262,8 +267,13 @@ loc_g_0F83: // zonk comes rolling from right to left
   X = GetStretchX(si + 1);
   Y = GetStretchY(si);
   dx = (bl & 0x7) + 1;
+#if 1
+  StretchedSprites.BltImg(X, Y, aniSpace, 0);
+  StretchedSprites.BltImg(X - (TwoPixels * dx), Y, aniZonkRollLeft, dx - 1);
+#else
   StretchedSprites.BltEx(X, Y, 0);
   StretchedSprites.BltEx(X - (TwoPixels * dx), Y, aniFramesZonkRollLeft[dx - 1]);
+#endif
   // +++++++++++++++++++++++++++++++++++++++++++++++++++++
   bl = HighByte(PlayField16[si]) + 1; // get and increment sequence#
   if (bl == 0x24)
@@ -294,8 +304,13 @@ loc_g_0FE8: // zonk comes rolling from left to right
   X = GetStretchX(si - 1);
   Y = GetStretchY(si);
   dx = (bl & 0x7) + 1;
+#if 1
+  StretchedSprites.BltImg(X, Y, aniSpace, 0);
+  StretchedSprites.BltImg(X + (TwoPixels * dx), Y, aniZonkRollRight, dx - 1);
+#else
   StretchedSprites.BltEx(X, Y, 0);
   StretchedSprites.BltEx(X + (TwoPixels * dx), Y, aniFramesZonkRollRight[dx - 1]);
+#endif
   // +++++++++++++++++++++++++++++++++++++++++++++++++++++
   bl = HighByte(PlayField16[si]) + 1;
   if (bl == 0x34)
@@ -346,8 +361,13 @@ loc_g_107B: // zonk rolls left
   X = GetStretchX(si);
   Y = GetStretchY(si);
   dx = (bl & 0xF) + 1;
+#if 1
+  StretchedSprites.BltImg(X, Y, aniSpace, 0);
+  StretchedSprites.BltImg(X - (TwoPixels * dx), Y, aniZonkRollLeft, dx - 1);
+#else
   StretchedSprites.BltEx(X, Y, 0);
   StretchedSprites.BltEx(X - (TwoPixels * dx), Y, aniFramesZonkRollLeft[dx - 1]);
+#endif
   // +++++++++++++++++++++++++++++++++++++++++++++++++++++
   bl = HighByte(PlayField16[si]) + 1; // retrieve and increment sequence#
   if (bl < 0x52)
@@ -383,8 +403,13 @@ loc_g_10E9: // zonk rolls right
   X = GetStretchX(si);
   Y = GetStretchY(si);
   dx = (bl & 0x7) + 1;
+#if 1
+  StretchedSprites.BltImg(X, Y, aniSpace, 0);
+  StretchedSprites.BltImg(X + (TwoPixels * dx), Y, aniZonkRollRight, dx - 1);
+#else
   StretchedSprites.BltEx(X, Y, 0);
   StretchedSprites.BltEx(X + (TwoPixels * dx), Y, aniFramesZonkRollRight[dx - 1]);
+#endif
   // +++++++++++++++++++++++++++++++++++++++++++++++++++++
   bl = HighByte(PlayField16[si]) + 1;
   if (bl < 0x62)