From df1edc3ca46dfcecb134c038702cab9e56fc46b5 Mon Sep 17 00:00:00 2001
From: Ivan Vangelista <mesgnet@yahoo.it>
Date: Mon, 14 Jul 2014 18:20:00 +0000
Subject: [PATCH] Fixed jumppop save state regression (nw)

---
 src/mame/drivers/esd16.c  |  2 ++
 src/mame/includes/esd16.h | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index f377c4e3115..bf4bfefdf61 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -585,11 +585,13 @@ void esd16_state::machine_start()
 	membank("bank1")->configure_entries(0, 16, &AUDIO[0x0000], 0x4000);
 
 	save_item(NAME(m_tilemap0_color));
+	save_item(NAME(m_tilemap1_color));
 }
 
 void esd16_state::machine_reset()
 {
 	m_tilemap0_color = 0;
+	m_tilemap1_color = 0;
 }
 
 DECOSPR_PRIORITY_CB_MEMBER(esd16_state::hedpanic_pri_callback)
diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h
index 750f1bfc0ee..2502edbcf22 100644
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@@ -20,14 +20,12 @@ public:
 		m_head_layersize(*this, "head_layersize"),
 		m_headpanic_platform_x(*this, "platform_x"),
 		m_headpanic_platform_y(*this, "platform_y"),
-		m_sprgen(*this, "spritegen"),
-		m_eeprom(*this, "eeprom"),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
-		m_gfxdecode(*this, "gfxdecode") {
-		m_tilemap0_color = 0;
-		m_tilemap1_color = 0;
-	}
+		m_gfxdecode(*this, "gfxdecode"),
+		m_sprgen(*this, "spritegen"),
+		m_eeprom(*this, "eeprom")
+		{}
 
 	/* memory pointers */
 	required_shared_ptr<UINT16> m_vram_0;
@@ -38,7 +36,6 @@ public:
 	required_shared_ptr<UINT16> m_head_layersize;
 	required_shared_ptr<UINT16> m_headpanic_platform_x;
 	required_shared_ptr<UINT16> m_headpanic_platform_y;
-	optional_device<decospr_device> m_sprgen;
 //  UINT16 *       m_paletteram;  // currently this uses generic palette handling
 
 	/* video-related */
@@ -50,7 +47,12 @@ public:
 	int           m_tilemap1_color;
 
 	/* devices */
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_audiocpu;
+	required_device<gfxdecode_device> m_gfxdecode;
+	optional_device<decospr_device> m_sprgen;
 	optional_device<eeprom_serial_93cxx_device> m_eeprom;
+	
 	DECLARE_WRITE16_MEMBER(esd16_sound_command_w);
 	DECLARE_WRITE16_MEMBER(hedpanic_platform_w);
 	DECLARE_READ16_MEMBER(esd_eeprom_r);
@@ -70,8 +72,4 @@ public:
 	virtual void video_start();
 	UINT32 screen_update_hedpanic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	DECOSPR_PRIORITY_CB_MEMBER(hedpanic_pri_callback);
-
-	required_device<cpu_device> m_maincpu;
-	required_device<cpu_device> m_audiocpu;
-	required_device<gfxdecode_device> m_gfxdecode;
 };