diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/emu/crsshair.h | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/emu/crsshair.h')
-rw-r--r-- | src/emu/crsshair.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/emu/crsshair.h b/src/emu/crsshair.h index a20c3303d91..609109d8b72 100644 --- a/src/emu/crsshair.h +++ b/src/emu/crsshair.h @@ -50,7 +50,7 @@ public: running_machine &machine() const { return m_machine; } int player() const { return m_player; } bool is_used() const { return m_used; } - UINT8 mode() const { return m_mode; } + uint8_t mode() const { return m_mode; } bool is_visible() const { return m_visible; } screen_device *screen() const { return m_screen; } float x() const { return m_x; } @@ -59,7 +59,7 @@ public: // setters void set_used(bool used) { m_used = used; } - void set_mode(UINT8 mode) { m_mode = mode; } + void set_mode(uint8_t mode) { m_mode = mode; } void set_visible(bool visible) { m_visible = visible; } void set_screen(screen_device *screen) { m_screen = screen; } //void setxy(float x, float y); @@ -67,8 +67,8 @@ public: void set_default_bitmap(); // updates - void animate(UINT16 auto_time); - void draw(render_container &container, UINT8 fade); + void animate(uint16_t auto_time); + void draw(render_container &container, uint8_t fade); private: // private helpers @@ -78,7 +78,7 @@ private: running_machine & m_machine; // reference to our machine int m_player; // player number bool m_used; // usage for this crosshair - UINT8 m_mode; // visibility mode for this crosshair + uint8_t m_mode; // visibility mode for this crosshair bool m_visible; // visibility for this crosshair std::unique_ptr<bitmap_argb32> m_bitmap; // bitmap for this crosshair render_texture * m_texture; // texture for this crosshair @@ -87,7 +87,7 @@ private: float m_y; // current Y position float m_last_x; // last X position float m_last_y; // last Y position - UINT16 m_time; // time since last movement + uint16_t m_time; // time since last movement std::string m_name; // name of png file }; @@ -109,8 +109,8 @@ public: // getters running_machine &machine() const { return m_machine; } render_crosshair &get_crosshair(int player) const { assert(player >= 0 && player < MAX_PLAYERS); assert(m_crosshair[player] != nullptr); return *m_crosshair[player]; } - UINT16 auto_time() const { return m_auto_time; } - void set_auto_time(UINT16 auto_time) { m_auto_time = auto_time; } + uint16_t auto_time() const { return m_auto_time; } + void set_auto_time(uint16_t auto_time) { m_auto_time = auto_time; } private: void exit(); @@ -124,9 +124,9 @@ private: bool m_usage; // true if any crosshairs are used std::unique_ptr<render_crosshair> m_crosshair[MAX_PLAYERS]; // per-player crosshair state - UINT8 m_fade; // color fading factor - UINT8 m_animation_counter; // animation frame index - UINT16 m_auto_time; // time in seconds to turn invisible + uint8_t m_fade; // color fading factor + uint8_t m_animation_counter; // animation frame index + uint16_t m_auto_time; // time in seconds to turn invisible }; #endif /* __CRSSHAIR_H__ */ |