diff options
Diffstat (limited to 'src/devices/bus')
-rw-r--r-- | src/devices/bus/macpds/pds_tpdfpd.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_48gc.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_m2hires.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_m2video.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_radiustpd.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_spec8.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_specpdq.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_wsportrait.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/pds30_30hr.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/pds30_cb264.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/pds30_mc30.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/pds30_procolor816.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/nubus/pds30_sigmalview.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/sms_ctrl/lphaser.cpp | 14 |
14 files changed, 44 insertions, 44 deletions
diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp index a6d39106c8b..b6ccb6c802a 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.cpp +++ b/src/devices/bus/macpds/pds_tpdfpd.cpp @@ -95,7 +95,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, SEDISPLAY_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -118,7 +118,7 @@ void macpds_sedisplay_device::device_start() m_macpds->install_device(0xc10000, 0xc2ffff, read16_delegate(FUNC(macpds_sedisplay_device::sedisplay_r), this), write16_delegate(FUNC(macpds_sedisplay_device::sedisplay_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(879, 0), 0); + m_timer->adjust(screen().time_until_pos(879, 0), 0); } //------------------------------------------------- @@ -145,7 +145,7 @@ void macpds_sedisplay_device::device_timer(emu_timer &timer, device_timer_id tid m_macpds->set_irq_line(M68K_IRQ_2, ASSERT_LINE); } - m_timer->adjust(m_screen->time_until_pos(879, 0), 0); + m_timer->adjust(screen().time_until_pos(879, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index e454b8cbcec..8e1bd9306fd 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -79,7 +79,7 @@ jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const m_is824(is824), m_assembled_tag(util::string_format("%s:%s", tag, GC48_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index 4c0481b16fc..da2964b0b45 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -73,7 +73,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, M2HIRES_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -100,7 +100,7 @@ void nubus_m2hires_device::device_start() m_nubus->install_device(slotspace+0x80000, slotspace+0xeffff, read32_delegate(FUNC(nubus_m2hires_device::m2hires_r), this), write32_delegate(FUNC(nubus_m2hires_device::m2hires_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -128,7 +128,7 @@ void nubus_m2hires_device::device_timer(emu_timer &timer, device_timer_id tid, i raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index a61859f0f40..38d86ef808a 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -75,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, M2VIDEO_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -102,7 +102,7 @@ void nubus_m2video_device::device_start() m_nubus->install_device(slotspace+0x80000, slotspace+0xeffff, read32_delegate(FUNC(nubus_m2video_device::m2video_r), this), write32_delegate(FUNC(nubus_m2video_device::m2video_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -130,7 +130,7 @@ void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, i raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp index 46676a99f37..dcf0ac1e660 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.cpp +++ b/src/devices/bus/nubus/nubus_radiustpd.cpp @@ -76,7 +76,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, de m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, RADIUSTPD_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -104,7 +104,7 @@ void nubus_radiustpd_device::device_start() m_nubus->install_device(slotspace+0x980000, slotspace+0x9effff, read32_delegate(FUNC(nubus_radiustpd_device::radiustpd_r), this), write32_delegate(FUNC(nubus_radiustpd_device::radiustpd_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -132,7 +132,7 @@ void nubus_radiustpd_device::device_timer(emu_timer &timer, device_timer_id tid, raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index d9c19173914..6217e4d8abc 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -78,7 +78,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device m_assembled_tag(util::string_format("%s:%s", tag, SPEC8S3_SCREEN_NAME)), m_vbl_pending(false), m_parameter(0) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -104,7 +104,7 @@ void nubus_spec8s3_device::device_start() m_nubus->install_device(slotspace+0xd0000, slotspace+0xfffff, read32_delegate(FUNC(nubus_spec8s3_device::spec8s3_r), this), write32_delegate(FUNC(nubus_spec8s3_device::spec8s3_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(767, 0), 0); + m_timer->adjust(screen().time_until_pos(767, 0), 0); } //------------------------------------------------- @@ -135,7 +135,7 @@ void nubus_spec8s3_device::device_timer(emu_timer &timer, device_timer_id tid, i m_vbl_pending = true; } - m_timer->adjust(m_screen->time_until_pos(767, 0), 0); + m_timer->adjust(screen().time_until_pos(767, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index 7cc46f46987..bf4c231e5c3 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -92,7 +92,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0), m_palette(*this, "palette") { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -117,7 +117,7 @@ void nubus_specpdq_device::device_start() m_nubus->install_device(slotspace+0x400000, slotspace+0xfbffff, read32_delegate(FUNC(nubus_specpdq_device::specpdq_r), this), write32_delegate(FUNC(nubus_specpdq_device::specpdq_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(843, 0), 0); + m_timer->adjust(screen().time_until_pos(843, 0), 0); } //------------------------------------------------- @@ -145,7 +145,7 @@ void nubus_specpdq_device::device_timer(emu_timer &timer, device_timer_id tid, i raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(843, 0), 0); + m_timer->adjust(screen().time_until_pos(843, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index 64dc4c0db7d..22b055e8336 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -76,7 +76,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, WSPORTRAIT_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -103,7 +103,7 @@ void nubus_wsportrait_device::device_start() m_nubus->install_device(slotspace+0x80000, slotspace+0xeffff, read32_delegate(FUNC(nubus_wsportrait_device::wsportrait_r), this), write32_delegate(FUNC(nubus_wsportrait_device::wsportrait_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(869, 0), 0); + m_timer->adjust(screen().time_until_pos(869, 0), 0); } //------------------------------------------------- @@ -128,7 +128,7 @@ void nubus_wsportrait_device::device_timer(emu_timer &timer, device_timer_id tid raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(869, 0), 0); + m_timer->adjust(screen().time_until_pos(869, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index 31e764cd5f6..0a351e5138b 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -76,7 +76,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, de m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, XCEED30HR_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -102,7 +102,7 @@ void nubus_xceed30hr_device::device_start() m_nubus->install_device(slotspace+0x800000, slotspace+0xefffff, read32_delegate(FUNC(nubus_xceed30hr_device::xceed30hr_r), this), write32_delegate(FUNC(nubus_xceed30hr_device::xceed30hr_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -130,7 +130,7 @@ void nubus_xceed30hr_device::device_timer(emu_timer &timer, device_timer_id tid, raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index 86079675739..1e730ddb5c3 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -70,7 +70,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, de m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, CB264SE30_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -96,7 +96,7 @@ void nubus_cb264se30_device::device_start() m_nubus->install_device(slotspace+0xf00000, slotspace+0xfeffff, read32_delegate(FUNC(nubus_cb264se30_device::cb264se30_r), this), write32_delegate(FUNC(nubus_cb264se30_device::cb264se30_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -124,7 +124,7 @@ void nubus_cb264se30_device::device_timer(emu_timer &timer, device_timer_id tid, raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index 2d48fdc5231..c66f219b13f 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -72,7 +72,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, de m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, XCEEDMC30_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -98,7 +98,7 @@ void nubus_xceedmc30_device::device_start() m_nubus->install_device(slotspace+0x800000, slotspace+0xefffff, read32_delegate(FUNC(nubus_xceedmc30_device::xceedmc30_r), this), write32_delegate(FUNC(nubus_xceedmc30_device::xceedmc30_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -126,7 +126,7 @@ void nubus_xceedmc30_device::device_timer(emu_timer &timer, device_timer_id tid, raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index 2333637761d..80691948af5 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -75,7 +75,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_assembled_tag(util::string_format("%s:%s", tag, PROCOLOR816_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -102,7 +102,7 @@ void nubus_procolor816_device::device_start() m_nubus->install_device(slotspace+0xf00000, slotspace+0xff7fff, read32_delegate(FUNC(nubus_procolor816_device::procolor816_r), this), write32_delegate(FUNC(nubus_procolor816_device::procolor816_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } //------------------------------------------------- @@ -130,7 +130,7 @@ void nubus_procolor816_device::device_timer(emu_timer &timer, device_timer_id ti raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(479, 0), 0); + m_timer->adjust(screen().time_until_pos(479, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index 860775b2e5d..5917d0f13b0 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -70,7 +70,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_typ m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0), m_assembled_tag(util::string_format("%s:%s", tag, LVIEW_SCREEN_NAME)) { - m_screen_tag = m_assembled_tag.c_str(); + static_set_screen(*this, m_assembled_tag.c_str()); } //------------------------------------------------- @@ -97,7 +97,7 @@ void nubus_lview_device::device_start() m_nubus->install_device(slotspace+0xb0000, slotspace+0xbffff, read32_delegate(FUNC(nubus_lview_device::lview_r), this), write32_delegate(FUNC(nubus_lview_device::lview_w), this)); m_timer = timer_alloc(0, nullptr); - m_timer->adjust(m_screen->time_until_pos(599, 0), 0); + m_timer->adjust(screen().time_until_pos(599, 0), 0); } //------------------------------------------------- @@ -123,7 +123,7 @@ void nubus_lview_device::device_timer(emu_timer &timer, device_timer_id tid, int raise_slot_irq(); } - m_timer->adjust(m_screen->time_until_pos(599, 0), 0); + m_timer->adjust(screen().time_until_pos(599, 0), 0); } /*************************************************************************** diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp index 264f74151a1..1782a75a689 100644 --- a/src/devices/bus/sms_ctrl/lphaser.cpp +++ b/src/devices/bus/sms_ctrl/lphaser.cpp @@ -93,7 +93,7 @@ sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, { // Workaround for failed validation that occurs when running on a driver // with Sega Scope emulation, which adds 2 screens (left/right lenses). - m_screen_tag = ":screen"; + static_set_screen(*this, ":screen"); } @@ -150,10 +150,10 @@ uint8_t sms_light_phaser_device::peripheral_r() int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int lgun_y ) { const int r_x_r = LGUN_RADIUS * LGUN_RADIUS; - const rectangle &visarea = m_screen->visible_area(); + const rectangle &visarea = screen().visible_area(); rectangle aim_area; - int beam_x = m_screen->hpos(); - int beam_y = m_screen->vpos(); + int beam_x = screen().hpos(); + int beam_y = screen().vpos(); int beam_x_orig = beam_x; int beam_y_orig = beam_y; int dy, result = 1; @@ -256,14 +256,14 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int } } - timer->adjust(m_screen->time_until_pos(beam_y, beam_x)); + timer->adjust(screen().time_until_pos(beam_y, beam_x)); return result; } uint16_t sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos) { - const rectangle &visarea = m_screen->visible_area(); + const rectangle &visarea = screen().visible_area(); int offset_x = (scaled_hpos * (visarea.max_x - visarea.min_x)) / 255; return visarea.min_x + offset_x; } @@ -271,7 +271,7 @@ uint16_t sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos) uint16_t sms_light_phaser_device::screen_vpos_nonscaled(int scaled_vpos) { - const rectangle &visarea = m_screen->visible_area(); + const rectangle &visarea = screen().visible_area(); int offset_y = (scaled_vpos * (visarea.max_y - visarea.min_y)) / 255; return visarea.min_y + offset_y; } |