From 67fce7b0c18d5610a5ce2b93a0998339df0b3ca5 Mon Sep 17 00:00:00 2001
From: dinkc64 <12570148+dinkc64@users.noreply.github.com>
Date: Mon, 28 Apr 2014 19:16:53 +0000
Subject: [PATCH] Ninja Warriors, Rastan 3 - Warrior Blade & Darius2 savestate
 improvements pt.2 (d_darius2.cpp, tc0100scn.cpp)

---
 src/burn/drv/taito/d_darius2.cpp | 18 +-----------------
 src/burn/drv/taito/tc0100scn.cpp | 13 +++++++++----
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/burn/drv/taito/d_darius2.cpp b/src/burn/drv/taito/d_darius2.cpp
index d0b8607b1..105f978f1 100644
--- a/src/burn/drv/taito/d_darius2.cpp
+++ b/src/burn/drv/taito/d_darius2.cpp
@@ -5,7 +5,7 @@
 #include "taito_ic.h"
 #include "burn_ym2610.h"
 
-static INT32 Ninjaw = 0, Warriorb = 0, WarriorbRedraw = 0;
+static INT32 Ninjaw = 0, Warriorb = 0;
 
 static double Darius2YM2610Route1MasterVol;
 static double Darius2YM2610Route2MasterVol;
@@ -1855,12 +1855,6 @@ static void WarriorbDraw()
 
 	BurnTransferClear();
 
-        if (WarriorbRedraw) {
-            //bprintf(PRINT_NORMAL, _T("woohoo!\n"));
-            //not yet.
-            WarriorbRedraw = 0;
-        }
-	
 	if (TC0100SCNBottomLayer(0)) {
 		if (!(Disable & 0x02)) TC0100SCNRenderFgLayer(0, 0, TaitoChars);
 		if (!(Disable2 & 0x02)) TC0100SCNRenderFgLayer(1, 0, TaitoCharsB);
@@ -1997,15 +1991,6 @@ static INT32 Darius2Scan(INT32 nAction, INT32 *pnMin)
 
 		if (TaitoNumYM2610) BurnYM2610Scan(nAction, pnMin);
 
-		TC0100SCNScan(nAction);
-		TC0110PCRScan(nAction);
-		TC0140SYTScan(nAction);
-		if (Warriorb) {
-			TC0510NIOScan(nAction);
-		} else {
-			TC0220IOCScan(nAction);
-		}
-
 		SCAN_VAR(TaitoInput);
 		SCAN_VAR(TaitoZ80Bank);
 		SCAN_VAR(nTaitoCyclesDone);
@@ -2017,7 +2002,6 @@ static INT32 Darius2Scan(INT32 nAction, INT32 *pnMin)
 		ZetMapArea(0x4000, 0x7fff, 0, TaitoZ80Rom1 + 0x4000 + (TaitoZ80Bank * 0x4000));
 		ZetMapArea(0x4000, 0x7fff, 2, TaitoZ80Rom1 + 0x4000 + (TaitoZ80Bank * 0x4000));
 		ZetClose();
-		WarriorbRedraw = 1;
 	}
 	
 	return 0;
diff --git a/src/burn/drv/taito/tc0100scn.cpp b/src/burn/drv/taito/tc0100scn.cpp
index a98425a94..c91c14054 100644
--- a/src/burn/drv/taito/tc0100scn.cpp
+++ b/src/burn/drv/taito/tc0100scn.cpp
@@ -628,9 +628,14 @@ void TC0100SCNScan(INT32 nAction)
 		SCAN_VAR(TC0100SCNFlip);
 		SCAN_VAR(TC0100SCNGfxBank);
 		SCAN_VAR(TC0100SCNDblWidth);
-		SCAN_VAR(TC0100SCNBgLayerUpdate);
-		SCAN_VAR(TC0100SCNFgLayerUpdate);
-		SCAN_VAR(TC0100SCNCharLayerUpdate);
-		SCAN_VAR(TC0100SCNCharRamUpdate);
+		if (nAction & ACB_WRITE) {
+			for (INT32 i = 0;i < TC0100SCNNum; i++) {
+				// re-draw the the screen after loading the savestate
+				TC0100SCNBgLayerUpdate[i] = 1;
+				TC0100SCNFgLayerUpdate[i] = 1;
+				TC0100SCNCharLayerUpdate[i] = 1;
+				TC0100SCNCharRamUpdate[i] = 1;
+			}
+		}
 	}
 }