(nw) nightmare : fixed validation and spacing

This commit is contained in:
Robbbert 2018-08-22 22:38:25 +10:00
parent 411742f363
commit 2c3c4485d1

View File

@ -230,9 +230,11 @@ public:
, m_vdc(*this, "vdc")
, m_vdc2(*this, "vdc2")
, m_eeprom(*this,"eeprom")
{ }
void nightmare(machine_config &config);
protected:
DECLARE_READ_LINE_MEMBER( clear_r );
DECLARE_READ_LINE_MEMBER( ef1_r );
DECLARE_READ_LINE_MEMBER( ef2_r );
@ -240,15 +242,12 @@ public:
DECLARE_WRITE8_MEMBER( ic10_w );
DECLARE_WRITE8_MEMBER( unkout_w );
void nightmare(machine_config &config);
void nightmare_map(address_map &map);
void nightmare_io_map(address_map &map);
void nightmare_sound_map(address_map &map);
void nightmare_sound_io_map(address_map &map);
uint32_t screen_update_nightmare(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void machine_start() override;
virtual void machine_reset() override;
@ -268,7 +267,6 @@ void nightmare_state::device_timer(emu_timer &timer, device_timer_id id, int par
switch (id)
{
case TIMER_SET_CPU_MODE:
m_reset = 1;
break;
default:
@ -382,7 +380,8 @@ uint32_t nightmare_state::screen_update_nightmare(screen_device &screen, bitmap_
uint32_t p2 = bitmap2[x];
uint32_t result = 0;
for(int shift=0; shift<32;shift+=8){
for(int shift=0; shift<32;shift+=8)
{
uint32_t data = ((p2>>shift)&0xff)+((p1>>shift)&0xff);
result|=((data>0xff)?0xff:data)<<shift;
}
@ -455,10 +454,10 @@ void nightmare_state::nightmare(machine_config &config)
SDA2006(config, m_eeprom);
/* video hardware */
TMS9928A( config, m_vdc, MASTER_CLOCK/2 );
TMS9928A( config, m_vdc, MASTER_CLOCK );
m_vdc->set_vram_size(0x4000);
TMS9928A( config, m_vdc2, MASTER_CLOCK/2 );
TMS9928A( config, m_vdc2, MASTER_CLOCK );
m_vdc2->set_vram_size(0x4000);
m_vdc2->int_callback().set_inputline(m_maincpu, COSMAC_INPUT_LINE_INT);
@ -477,7 +476,6 @@ ROM_START( nightmare )
ROM_REGION( 0x10000, "cdp1802_sound", 0 )
ROM_LOAD( "sound.bin", 0x0000, 0x4000, NO_DUMP )
ROM_END
GAME( 1982, nightmare, 0, nightmare, nightmare, nightmare_state, empty_init, ROT90, "E.F.O.", "Nightmare", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )