summaryrefslogtreecommitdiffstats
path: root/src/mame/video/cps1.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-07-20 12:31:21 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-07-20 12:31:21 +1000
commitd2926fa02cef5bf728eac74c9e5586aced02a80b (patch)
tree820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/mame/video/cps1.cpp
parent24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff)
parent68139508715a0375e657add4197582271ef446ec (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/emu/digfx.h
Diffstat (limited to 'src/mame/video/cps1.cpp')
-rw-r--r--src/mame/video/cps1.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp
index 6c0fb44f910..0229acb5188 100644
--- a/src/mame/video/cps1.cpp
+++ b/src/mame/video/cps1.cpp
@@ -442,8 +442,6 @@ The games seem to use them to mark platforms, kill zones and no-go areas.
#include "emu.h"
#include "includes/cps1.h"
-#include <algorithm>
-
#define VERBOSE 0
/********************************************************************
@@ -2274,7 +2272,7 @@ void cps_state::video_start()
m_bg_tilemap[2] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cps_state::get_tile2_info),this), tilemap_mapper_delegate(FUNC(cps_state::tilemap2_scan),this), 32, 32, 64, 64);
/* create empty tiles */
- std::fill(std::begin(m_empty_tile), std::end(m_empty_tile), 0x0f);
+ memset(m_empty_tile, 0x0f, sizeof(m_empty_tile));
/* front masks will change at runtime to handle sprite occluding */
cps1_update_transmasks();