mirror of
https://github.com/holub/mame
synced 2025-10-07 17:27:06 +03:00
Cleanup (nw)
This commit is contained in:
parent
77e135970f
commit
dc08f48c36
@ -820,7 +820,7 @@ bool cheat_entry::activate()
|
|||||||
{
|
{
|
||||||
execute_on_script();
|
execute_on_script();
|
||||||
changed = true;
|
changed = true;
|
||||||
manager().machine().popmessage("Activated %s", m_description.c_str());
|
m_manager.machine().popmessage("Activated %s", m_description.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we're a oneshot parameter cheat and we're active, execute the "state change" script and indicate change
|
// if we're a oneshot parameter cheat and we're active, execute the "state change" script and indicate change
|
||||||
@ -828,7 +828,7 @@ bool cheat_entry::activate()
|
|||||||
{
|
{
|
||||||
execute_change_script();
|
execute_change_script();
|
||||||
changed = true;
|
changed = true;
|
||||||
manager().machine().popmessage("Activated\n %s = %s", m_description.c_str(), m_parameter->text());
|
m_manager.machine().popmessage("Activated\n %s = %s", m_description.c_str(), m_parameter->text());
|
||||||
}
|
}
|
||||||
|
|
||||||
return changed;
|
return changed;
|
||||||
|
@ -1698,7 +1698,7 @@ bool render_target::load_layout_file(const char *dirname, const char *filename)
|
|||||||
fname.insert(0, PATH_SEPARATOR).insert(0, dirname);
|
fname.insert(0, PATH_SEPARATOR).insert(0, dirname);
|
||||||
|
|
||||||
// attempt to open the file; bail if we can't
|
// attempt to open the file; bail if we can't
|
||||||
emu_file layoutfile(manager().machine().options().art_path(), OPEN_FLAG_READ);
|
emu_file layoutfile(m_manager.machine().options().art_path(), OPEN_FLAG_READ);
|
||||||
osd_file::error filerr = layoutfile.open(fname.c_str());
|
osd_file::error filerr = layoutfile.open(fname.c_str());
|
||||||
if (filerr != osd_file::error::NONE)
|
if (filerr != osd_file::error::NONE)
|
||||||
return false;
|
return false;
|
||||||
@ -1905,9 +1905,9 @@ void render_target::add_container_primitives(render_primitive_list &list, const
|
|||||||
// 1 1 0 solarq X Y
|
// 1 1 0 solarq X Y
|
||||||
// 1 1 1 barrier !X !Y
|
// 1 1 1 barrier !X !Y
|
||||||
|
|
||||||
bool flip_x = (manager().machine().system().flags & ORIENTATION_FLIP_X) == ORIENTATION_FLIP_X;
|
bool flip_x = (m_manager.machine().system().flags & ORIENTATION_FLIP_X) == ORIENTATION_FLIP_X;
|
||||||
bool flip_y = (manager().machine().system().flags & ORIENTATION_FLIP_Y) == ORIENTATION_FLIP_Y;
|
bool flip_y = (m_manager.machine().system().flags & ORIENTATION_FLIP_Y) == ORIENTATION_FLIP_Y;
|
||||||
bool swap_xy = (manager().machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
|
bool swap_xy = (m_manager.machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY;
|
||||||
|
|
||||||
int vectororient = 0;
|
int vectororient = 0;
|
||||||
if (flip_x)
|
if (flip_x)
|
||||||
@ -2066,7 +2066,7 @@ bool render_target::map_point_internal(INT32 target_x, INT32 target_y, render_co
|
|||||||
// convert target coordinates to float
|
// convert target coordinates to float
|
||||||
float target_fx = (float)(target_x - root_xform.xoffs) / viswidth;
|
float target_fx = (float)(target_x - root_xform.xoffs) / viswidth;
|
||||||
float target_fy = (float)(target_y - root_xform.yoffs) / visheight;
|
float target_fy = (float)(target_y - root_xform.yoffs) / visheight;
|
||||||
if (manager().machine().ui().is_menu_active())
|
if (m_manager.machine().ui().is_menu_active())
|
||||||
{
|
{
|
||||||
target_fx = (float)target_x / m_width;
|
target_fx = (float)target_x / m_width;
|
||||||
target_fy = (float)target_y / m_height;
|
target_fy = (float)target_y / m_height;
|
||||||
|
@ -472,7 +472,7 @@ float render_font::utf8string_width(float height, float aspect, const char *utf8
|
|||||||
bool render_font::load_cached_bdf(const char *filename)
|
bool render_font::load_cached_bdf(const char *filename)
|
||||||
{
|
{
|
||||||
// first try to open the BDF itself
|
// first try to open the BDF itself
|
||||||
emu_file file(manager().machine().options().font_path(), OPEN_FLAG_READ);
|
emu_file file(m_manager.machine().options().font_path(), OPEN_FLAG_READ);
|
||||||
osd_file::error filerr = file.open(filename);
|
osd_file::error filerr = file.open(filename);
|
||||||
if (filerr != osd_file::error::NONE)
|
if (filerr != osd_file::error::NONE)
|
||||||
return false;
|
return false;
|
||||||
@ -495,7 +495,7 @@ bool render_font::load_cached_bdf(const char *filename)
|
|||||||
|
|
||||||
// attempt to open the cached version of the font
|
// attempt to open the cached version of the font
|
||||||
{
|
{
|
||||||
emu_file cachefile(manager().machine().options().font_path(), OPEN_FLAG_READ);
|
emu_file cachefile(m_manager.machine().options().font_path(), OPEN_FLAG_READ);
|
||||||
filerr = cachefile.open(cachedname.c_str());
|
filerr = cachefile.open(cachedname.c_str());
|
||||||
if (filerr == osd_file::error::NONE)
|
if (filerr == osd_file::error::NONE)
|
||||||
{
|
{
|
||||||
@ -732,7 +732,7 @@ bool render_font::save_cached(const char *filename, UINT32 hash)
|
|||||||
osd_printf_warning("Generating cached BDF font...\n");
|
osd_printf_warning("Generating cached BDF font...\n");
|
||||||
|
|
||||||
// attempt to open the file
|
// attempt to open the file
|
||||||
emu_file file(manager().machine().options().font_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE);
|
emu_file file(m_manager.machine().options().font_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE);
|
||||||
osd_file::error filerr = file.open(filename);
|
osd_file::error filerr = file.open(filename);
|
||||||
if (filerr != osd_file::error::NONE)
|
if (filerr != osd_file::error::NONE)
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user