fix eyeball tile during scrolling (third times the charm)

Author: connorjclark

src/zc/hero.cpp

@@ -25673,6 +25673,8 @@ void HeroClass::scrollscr(int32_t scrolldir, int32_t destscr, int32_t destdmap)
 		clear_bitmap(framebuf);
 		clear_a5_bmp(rti_infolayer.bitmap);
 
+		combotile_add_x = 0;
+		combotile_add_y = playing_field_offset;
 		switch(scrolldir)
 		{
 		case up:
@@ -25690,8 +25692,7 @@ void HeroClass::scrollscr(int32_t scrolldir, int32_t destscr, int32_t destdmap)
 
 			if(XOR((newscr->flags7&fLAYER3BG) || (oldscr->flags7&fLAYER3BG), DMaps[currdmap].flags&dmfLAYER3BG)) do_primitives(scrollbuf, 3, newscr, sx, sy);
 
-			combotile_add_x = -sx;
-			combotile_add_y = -sy + playing_field_offset;
+			combotile_add_y -= sy;
 			putscr(scrollbuf, 0, 0, newscr);
 			putscr(scrollbuf, 0, 176, oldscr);
 			break;
@@ -25709,8 +25710,7 @@ void HeroClass::scrollscr(int32_t scrolldir, int32_t destscr, int32_t destdmap)
 
 			if(XOR((newscr->flags7&fLAYER3BG) || (oldscr->flags7&fLAYER3BG), DMaps[currdmap].flags&dmfLAYER3BG)) do_primitives(scrollbuf, 3, newscr, sx, sy);
 
-			combotile_add_x = -sx;
-			combotile_add_y = -sy + playing_field_offset;
+			combotile_add_y -= sy;
 			putscr(scrollbuf, 0, 0, oldscr);
 			putscr(scrollbuf, 0, 176, newscr);
 			break;
@@ -25728,8 +25728,7 @@ void HeroClass::scrollscr(int32_t scrolldir, int32_t destscr, int32_t destdmap)
 
 			if(XOR((newscr->flags7&fLAYER3BG) || (oldscr->flags7&fLAYER3BG), DMaps[currdmap].flags&dmfLAYER3BG)) do_primitives(scrollbuf, 3, newscr, sx, sy);
 
-			combotile_add_x = -sx;
-			combotile_add_y = -sy + playing_field_offset;
+			combotile_add_x -= sx;
 			putscr(scrollbuf, 0, 0, newscr);
 			putscr(scrollbuf, 256, 0, oldscr);
 			break;
@@ -25747,8 +25746,7 @@ void HeroClass::scrollscr(int32_t scrolldir, int32_t destscr, int32_t destdmap)
 
 			if(XOR((newscr->flags7&fLAYER3BG) || (oldscr->flags7&fLAYER3BG), DMaps[currdmap].flags&dmfLAYER3BG)) do_primitives(scrollbuf, 3, newscr, sx, sy);
 
-			combotile_add_x = -sx;
-			combotile_add_y = -sy + playing_field_offset;
+			combotile_add_x -= sx;
 			putscr(scrollbuf, 0, 0, oldscr);
 			putscr(scrollbuf, 256, 0, newscr);
 			break;

tests/replays/first_quest_layered.zplay

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae825bd355836988d879858c46df3e80564b2ef01800266be9598a05b735c576
+oid sha256:c2f080848aac03ddd9b36b2596c804a4f009468bfb766ac13c482b222601566f
 size 30804660

tests/replays/hero_of_dreams.zplay

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe728c118940290a9b98cf59dfefe148b9210e141e8677b72cf709a71733ba42
+oid sha256:e7eef48288346706cb40aa3b92fb28f39c1f5b1579453aebc980666973969654
 size 22157420

tests/replays/lands_of_serenity.zplay

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:639421cfcf8d7b4d9792b76248b14b208afa9ee55e973d4d57baf8101df22a09
+oid sha256:d3d0dc5cb99ebedde189b695eb6d6363fc9382afecace176f1393cd9054e225a
 size 37050025

tests/replays/link_to_the_zelda.zplay

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd2412441965816fcdb66f3ea83479ada6f1cf06aba6d0414312ff82b3ffcd43
+oid sha256:e357eb46082b3e46538952b3379de0d51c977b757254c550f570ba8a14e7e255
 size 10388845