From 18e90bc3133a18677b0c8cba78d47f090626343e Mon Sep 17 00:00:00 2001
From: Ivan Vangelista <mesgnet@yahoo.it>
Date: Mon, 18 May 2015 19:44:40 +0200
Subject: [PATCH] tc0100scn.c: fixed postload, fixes cameltry save state
 regression (nw) taitof2.c: killed anonymous timer while I was at it (nw)

---
 src/mame/drivers/taito_f2.c  | 3 ++-
 src/mame/includes/taito_f2.h | 1 +
 src/mame/video/tc0100scn.c   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 968a77a9bc2..80a69da57db 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -586,7 +586,7 @@ void taitof2_state::device_timer(emu_timer &timer, device_timer_id id, int param
 
 INTERRUPT_GEN_MEMBER(taitof2_state::taitof2_interrupt)
 {
-	timer_set(downcast<cpu_device *>(&device)->cycles_to_attotime(500), TIMER_TAITOF2_INTERRUPT6);
+	m_int6_timer->adjust(m_maincpu->cycles_to_attotime(500));
 	device.execute().set_input_line(5, HOLD_LINE);
 }
 
@@ -2836,6 +2836,7 @@ WRITE8_MEMBER(taitof2_state::cameltrya_porta_w)
 
 MACHINE_START_MEMBER(taitof2_state,common)
 {
+	m_int6_timer = timer_alloc(TIMER_TAITOF2_INTERRUPT6);
 }
 
 MACHINE_START_MEMBER(taitof2_state,f2)
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index e31c6d609df..98c9f772fbb 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -96,6 +96,7 @@ public:
 	int             m_nibble;
 	INT32           m_driveout_sound_latch;
 	INT32           m_oki_bank;
+	emu_timer       *m_int6_timer;
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
diff --git a/src/mame/video/tc0100scn.c b/src/mame/video/tc0100scn.c
index 05f2fc2eea0..c5764ac96d7 100644
--- a/src/mame/video/tc0100scn.c
+++ b/src/mame/video/tc0100scn.c
@@ -446,6 +446,8 @@ void tc0100scn_device::postload()
 {
 	set_layer_ptrs();
 	restore_scroll();
+	
+	m_gfxdecode->gfx(m_txnum)->set_source((UINT8 *)m_char_ram);
 
 	m_tilemap[0][0]->mark_all_dirty();
 	m_tilemap[1][0]->mark_all_dirty();