fix compile in MSVC 2015 (nw)

This commit is contained in:
Peter Ferrie 2015-12-08 08:43:09 -08:00
parent 407e00816c
commit 8678d95c8e
4 changed files with 4 additions and 4 deletions

View File

@ -2495,7 +2495,7 @@ rpk* rpk_reader::open(emu_options &options, const char *filename, const char *sy
if (!found) throw rpk_exception(RPK_INVALID_RESOURCE_REF, uses_name); if (!found) throw rpk_exception(RPK_INVALID_RESOURCE_REF, uses_name);
} }
} }
catch (rpk_exception &exp) catch (rpk_exception &)
{ {
newrpk->close(); newrpk->close();
if (layout_xml != nullptr) xml_file_free(layout_xml); if (layout_xml != nullptr) xml_file_free(layout_xml);

View File

@ -68,7 +68,7 @@ protected:
bool m_scheduled_IND_bit_reset; bool m_scheduled_IND_bit_reset;
bool m_indirect_addressing; bool m_indirect_addressing;
bool m_flags; int m_flags;
// V = "Vai um" (Carry flag) // V = "Vai um" (Carry flag)
// T = "Transbordo" (Overflow flag) // T = "Transbordo" (Overflow flag)

View File

@ -182,7 +182,7 @@ READ16_MEMBER(rungun_state::palette_read)
WRITE16_MEMBER(rungun_state::palette_write) WRITE16_MEMBER(rungun_state::palette_write)
{ {
palette_device *cur_paldevice = m_video_mux_bank == 0 ? m_palette : m_palette2; palette_device *cur_paldevice = m_video_mux_bank == 0 ? m_palette : static_cast<palette_device *>(m_palette2);
UINT32 addr = offset + m_video_mux_bank*0x800/2; UINT32 addr = offset + m_video_mux_bank*0x800/2;
COMBINE_DATA(&m_pal_ram[addr]); COMBINE_DATA(&m_pal_ram[addr]);

View File

@ -1836,7 +1836,7 @@ void taito_f3_state::get_line_ram_info(tilemap_t *tmap, int sx, int sy, int pos,
y_end=-1; y_end=-1;
y_inc=-1; y_inc=-1;
if (m_f3_game_config->extend) sx=-sx+(UINT16(188-512)<<16); else sx=-sx+(188<<16); /* Adjust for flipped scroll position */ if (m_f3_game_config->extend) sx=-sx+(((188-512)&0xffff)<<16); else sx=-sx+(188<<16); /* Adjust for flipped scroll position */
y_index_fx=-sy-(256<<16); /* Adjust for flipped scroll position */ y_index_fx=-sy-(256<<16); /* Adjust for flipped scroll position */
} }
else else