summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2018-05-22 11:33:27 -0400
committer AJR <ajrhacker@users.noreply.github.com>2018-05-22 11:33:27 -0400
commit012b049c7fa8ce1d8a9e5f1c5d70f93912ab98f8 (patch)
tree543805da6b35a8ebd5cb170cffc9afdb5fbd00a2
parent447cda56672dc0ed1d09287996492516553b19a2 (diff)
cps1.cpp: Move another variable down into cps2_state (nw)
-rw-r--r--src/mame/includes/cps1.h2
-rw-r--r--src/mame/video/cps1.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 77bf9a70af8..ae07ba3151e 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -362,7 +362,6 @@ protected:
const struct CPS1config *m_game_config;
int m_scroll_size;
int m_obj_size;
- int m_cps2_obj_size;
int m_other_size;
int m_palette_align;
int m_palette_size;
@@ -485,6 +484,7 @@ private:
int m_cps2_last_sprite_offset; /* Offset of the last sprite */
int m_pri_ctrl; /* Sprite layer priorities */
int m_objram_bank;
+ int m_cps2_obj_size;
/* misc */
int m_readpaddle; // pzloop2
diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp
index 8cec2c8ee30..ea1f6994fd8 100644
--- a/src/mame/video/cps1.cpp
+++ b/src/mame/video/cps1.cpp
@@ -2250,7 +2250,6 @@ void cps_state::video_start()
/* Put in some const */
m_scroll_size = 0x4000; /* scroll1, scroll2, scroll3 */
m_obj_size = 0x0800;
- m_cps2_obj_size = 0x2000;
m_other_size = 0x0800;
m_palette_align = 0x0400; /* minimum alignment is a single palette page (512 colors). Verified on pcb. */
m_palette_size = cps1_palette_entries * 32; /* Size of palette RAM */
@@ -2326,6 +2325,7 @@ void cps2_state::video_start()
{
cps_state::video_start();
+ m_cps2_obj_size = 0x2000;
m_cps2_buffered_obj = make_unique_clear<uint16_t[]>(m_cps2_obj_size / 2);
memset(m_objram1, 0, m_cps2_obj_size);