summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/timer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/timer.cpp')
-rw-r--r--src/emu/timer.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/timer.cpp b/src/emu/timer.cpp
index 7d089ca4655..605a16a7d4f 100644
--- a/src/emu/timer.cpp
+++ b/src/emu/timer.cpp
@@ -36,15 +36,15 @@ timer_device::timer_device(const machine_config &mconfig, const char *tag, devic
: device_t(mconfig, TIMER, "Timer", tag, owner, clock, "timer", __FILE__),
m_type(TIMER_TYPE_GENERIC),
m_callback(timer_device_expired_delegate()),
- m_ptr(NULL),
+ m_ptr(nullptr),
m_start_delay(attotime::zero),
m_period(attotime::zero),
m_param(0),
- m_screen_tag(NULL),
- m_screen(NULL),
+ m_screen_tag(nullptr),
+ m_screen(nullptr),
m_first_vpos(0),
m_increment(0),
- m_timer(NULL),
+ m_timer(nullptr),
m_first_time(true)
{
}
@@ -152,14 +152,14 @@ void timer_device::device_validity_check(validity_checker &valid) const
switch (m_type)
{
case TIMER_TYPE_GENERIC:
- if (m_screen_tag != NULL || m_first_vpos != 0 || m_start_delay != attotime::zero)
+ if (m_screen_tag != nullptr || m_first_vpos != 0 || m_start_delay != attotime::zero)
osd_printf_warning("Generic timer specified parameters for a scanline timer\n");
if (m_period != attotime::zero || m_start_delay != attotime::zero)
osd_printf_warning("Generic timer specified parameters for a periodic timer\n");
break;
case TIMER_TYPE_PERIODIC:
- if (m_screen_tag != NULL || m_first_vpos != 0)
+ if (m_screen_tag != nullptr || m_first_vpos != 0)
osd_printf_warning("Periodic timer specified parameters for a scanline timer\n");
if (m_period <= attotime::zero)
osd_printf_error("Periodic timer specified invalid period\n");
@@ -191,7 +191,7 @@ void timer_device::device_validity_check(validity_checker &valid) const
void timer_device::device_start()
{
// fetch the screen
- if (m_screen_tag != NULL)
+ if (m_screen_tag != nullptr)
m_screen = machine().device<screen_device>(m_screen_tag);
// allocate the timer
@@ -234,7 +234,7 @@ void timer_device::device_reset()
}
case TIMER_TYPE_SCANLINE:
- if (m_screen == NULL)
+ if (m_screen == nullptr)
fatalerror("timer '%s': unable to find screen '%s'\n", tag(), m_screen_tag);
// set the timer to fire immediately