summaryrefslogtreecommitdiffstats
path: root/src/emu/digfx.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/digfx.h')
-rw-r--r--src/emu/digfx.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/emu/digfx.h b/src/emu/digfx.h
index a31625399e6..9ce8c354db8 100644
--- a/src/emu/digfx.h
+++ b/src/emu/digfx.h
@@ -23,9 +23,9 @@
// CONSTANTS
//**************************************************************************
-const UINT8 MAX_GFX_ELEMENTS = 32;
-const UINT16 MAX_GFX_PLANES = 8;
-const UINT16 MAX_GFX_SIZE = 32;
+const uint8_t MAX_GFX_ELEMENTS = 32;
+const uint16_t MAX_GFX_PLANES = 8;
+const uint16_t MAX_GFX_SIZE = 32;
@@ -160,29 +160,29 @@ class palette_device;
struct gfx_layout
{
- UINT32 xoffs(int x) const { return (extxoffs != nullptr) ? extxoffs[x] : xoffset[x]; }
- UINT32 yoffs(int y) const { return (extyoffs != nullptr) ? extyoffs[y] : yoffset[y]; }
-
- UINT16 width; // pixel width of each element
- UINT16 height; // pixel height of each element
- UINT32 total; // total number of elements, or RGN_FRAC()
- UINT16 planes; // number of bitplanes
- UINT32 planeoffset[MAX_GFX_PLANES]; // bit offset of each bitplane
- UINT32 xoffset[MAX_GFX_SIZE]; // bit offset of each horizontal pixel
- UINT32 yoffset[MAX_GFX_SIZE]; // bit offset of each vertical pixel
- UINT32 charincrement; // distance between two consecutive elements (in bits)
- const UINT32 * extxoffs; // extended X offset array for really big layouts
- const UINT32 * extyoffs; // extended Y offset array for really big layouts
+ uint32_t xoffs(int x) const { return (extxoffs != nullptr) ? extxoffs[x] : xoffset[x]; }
+ uint32_t yoffs(int y) const { return (extyoffs != nullptr) ? extyoffs[y] : yoffset[y]; }
+
+ uint16_t width; // pixel width of each element
+ uint16_t height; // pixel height of each element
+ uint32_t total; // total number of elements, or RGN_FRAC()
+ uint16_t planes; // number of bitplanes
+ uint32_t planeoffset[MAX_GFX_PLANES]; // bit offset of each bitplane
+ uint32_t xoffset[MAX_GFX_SIZE]; // bit offset of each horizontal pixel
+ uint32_t yoffset[MAX_GFX_SIZE]; // bit offset of each vertical pixel
+ uint32_t charincrement; // distance between two consecutive elements (in bits)
+ const uint32_t * extxoffs; // extended X offset array for really big layouts
+ const uint32_t * extyoffs; // extended Y offset array for really big layouts
};
struct gfx_decode_entry
{
const char * memory_region; // memory region where the data resides
- UINT32 start; // offset of beginning of data to decode
+ uint32_t start; // offset of beginning of data to decode
const gfx_layout *gfxlayout; // pointer to gfx_layout describing the layout; nullptr marks the end of the array
- UINT16 color_codes_start; // offset in the color lookup table where color codes start
- UINT16 total_color_codes; // total number of color codes
- UINT32 flags; // flags and optional scaling factors
+ uint16_t color_codes_start; // offset in the color lookup table where color codes start
+ uint16_t total_color_codes; // total number of color codes
+ uint32_t flags; // flags and optional scaling factors
};
// ======================> device_gfx_interface
@@ -201,13 +201,13 @@ public:
// getters
palette_device &palette() const { assert(m_palette != nullptr); return *m_palette; }
- gfx_element *gfx(UINT8 index) const { assert(index < MAX_GFX_ELEMENTS); return m_gfx[index].get(); }
+ gfx_element *gfx(uint8_t index) const { assert(index < MAX_GFX_ELEMENTS); return m_gfx[index].get(); }
// decoding
void decode_gfx(const gfx_decode_entry *gfxdecodeinfo);
void decode_gfx() { decode_gfx(m_gfxdecodeinfo); }
- void set_gfx(UINT8 index, std::unique_ptr<gfx_element> &&element) { assert(index < MAX_GFX_ELEMENTS); m_gfx[index] = std::move(element); }
+ void set_gfx(uint8_t index, std::unique_ptr<gfx_element> &&element) { assert(index < MAX_GFX_ELEMENTS); m_gfx[index] = std::move(element); }
protected:
// interface-level overrides