From f7085b824dd4d31115cc005853a3b5ef49908784 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 22 Mar 2020 10:11:08 +0100 Subject: xavix2: osso's compile fix (nw) --- src/mame/drivers/xavix2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/xavix2.cpp b/src/mame/drivers/xavix2.cpp index 5c1411b68e5..7d17e36658f 100644 --- a/src/mame/drivers/xavix2.cpp +++ b/src/mame/drivers/xavix2.cpp @@ -594,10 +594,10 @@ void xavix2_state::mem(address_map &map) uint32_t xavix2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if(machine().input().code_pressed_once(KEYCODE_8)) - irq_raise(8); - if(machine().input().code_pressed_once(KEYCODE_0)) - irq_raise(10); + if(machine().input().code_pressed_once(KEYCODE_8)) + irq_raise(8); + if(machine().input().code_pressed_once(KEYCODE_0)) + irq_raise(10); constexpr int dx = 0x400 - 320; constexpr int dy = 0x200 - 200; -- cgit v1.2.3 From 9a0f1dfdf1235c41d97052ac9abf4e844e154c34 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sun, 22 Mar 2020 16:26:02 +1100 Subject: (nw) sorted mess.flt (cherry picked from commit 0984cef88a73fc544e4f2ec3f21a727a51fda863) --- src/mame/mess.flt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 15dd98d5360..cd6eadf3811 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -699,8 +699,8 @@ pofo.cpp poisk1.cpp pokemini.cpp poly.cpp -poly88.cpp poly800.cpp +poly88.cpp poly880.cpp polysix.cpp powerstack.cpp @@ -846,10 +846,10 @@ spg2xx_lexibook.cpp spg2xx_mysprtch.cpp spg2xx_pdc.cpp spg2xx_playvision.cpp -spg2xx_skannerztv.cpp spg2xx_senario.cpp spg2xx_senario_poker.cpp spg2xx_shredmjr.cpp +spg2xx_skannerztv.cpp spg2xx_smarttv.cpp spg2xx_telestory.cpp spg2xx_tvgogo.cpp @@ -1087,7 +1087,6 @@ zx.cpp //jaguar.cpp +jaguar +jaguarcd -//konamim2.cpp //neogeo.cpp +aes //vectrex.cpp -- cgit v1.2.3 From b6b96c9e377c5525e22131f75c2ad4f7ff5a3942 Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Sun, 22 Mar 2020 20:58:13 +0100 Subject: -unsp: Actually respect the IRQ enable flag. Fixes vsmile lionking, jak_s500 SDRAM test, probably others. [Ryan Holtz] --- src/devices/cpu/unsp/unsp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp index 1c1460710e6..6a47bf61dd2 100644 --- a/src/devices/cpu/unsp/unsp.cpp +++ b/src/devices/cpu/unsp/unsp.cpp @@ -458,7 +458,7 @@ inline void unsp_device::trigger_fiq() inline void unsp_device::trigger_irq(int line) { - if ((m_core->m_ine == 0 && m_core->m_irq == 1) || m_core->m_pri <= line) + if ((m_core->m_ine == 0 && m_core->m_irq == 1) || m_core->m_pri <= line || !m_core->m_enable_irq) return; m_core->m_irq = 1; -- cgit v1.2.3 From 47f0349ffc24e0429f46d138fadfa0a4377bc64d Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 23 Mar 2020 09:39:11 -0400 Subject: upd78k3: Fix SFR identification in disassembly of MOV A,sfr and MOV sfr,A opcodes (SFR pair names were erroneously used instead) --- src/devices/cpu/upd78k/upd78k3d.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/cpu/upd78k/upd78k3d.cpp b/src/devices/cpu/upd78k/upd78k3d.cpp index 5d270e227aa..b251f06e6b0 100644 --- a/src/devices/cpu/upd78k/upd78k3d.cpp +++ b/src/devices/cpu/upd78k/upd78k3d.cpp @@ -767,11 +767,11 @@ offs_t upd78k3_disassembler::disassemble(std::ostream &stream, offs_t pc, const util::stream_format(stream, "%-8s", "MOV"); if (!BIT(op, 1)) stream << "A,"; - u8 sfrp = opcodes.r8(pc + 1); - if (sfrp >= 0xfe) - util::stream_format(stream, "PSW%c", BIT(sfrp, 0) ? 'H' : 'L'); + u8 sfr = opcodes.r8(pc + 1); + if (sfr >= 0xfe) + util::stream_format(stream, "PSW%c", BIT(sfr, 0) ? 'H' : 'L'); else - format_sfrp(stream, sfrp); + format_sfr(stream, sfr); if (BIT(op, 1)) stream << ",A"; } -- cgit v1.2.3 From 7038bb974ce42532a3aa62007f0704f461ac2aa6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 1 Apr 2020 17:16:15 +1100 Subject: pardon my French (correct some software list titles) (nw) --- hash/vsmile_cart.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 4ecc8bf8f15..6dfcb8b0211 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -681,7 +681,7 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul - Les adventures du Petit Chaperon Rouge (France) + Les aventures du Petit Chaperon Rouge (France) 200? VTech @@ -2361,7 +2361,7 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul - Disney Mickey - Meickey à la Recherche De Pluto (France) + Disney Mickey - Mickey à la Recherche De Pluto (France) 2005 VTech -- cgit v1.2.3 From 17f760e9b3b78b23690846b88924b2cbc4c5ff58 Mon Sep 17 00:00:00 2001 From: cam900 Date: Thu, 26 Mar 2020 22:23:07 +0900 Subject: namco_c355spr.cpp : Fix copybitmap --- src/mame/video/namco_c355spr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mame/video/namco_c355spr.cpp b/src/mame/video/namco_c355spr.cpp index 9655929cc82..cd06bfe1664 100644 --- a/src/mame/video/namco_c355spr.cpp +++ b/src/mame/video/namco_c355spr.cpp @@ -161,7 +161,7 @@ void namco_c355spr_device::copybitmap(bitmap_ind16 &dest_bmp, const rectangle &c dest[x] = 0x6000|(dest[x] & 0x1fff); break; default: - dest[x] = c; + dest[x] = gfx(0)->colorbase() + c; break; } } @@ -193,7 +193,7 @@ void namco_c355spr_device::copybitmap(bitmap_ind16 &dest_bmp, const rectangle &c } else { - dest[x] = c; + dest[x] = gfx(0)->colorbase() + c; } } } @@ -208,7 +208,7 @@ void namco_c355spr_device::copybitmap(bitmap_rgb32 &dest_bmp, const rectangle &c device_palette_interface &palette = gfx(0)->palette(); const int shadow_offset = (palette.shadows_enabled()) ? palette.entries() : 0; const pen_t black = palette.black_pen(); - const pen_t *pal = palette.pens(); + const pen_t *pal = &palette.pen(gfx(0)->colorbase()); if (m_palxor) { for (int y = clip.min_y; y <= clip.max_y; y++) -- cgit v1.2.3 From bce322107551daf8c069957df66689ba2d611aa4 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 4 Apr 2020 07:03:38 +1100 Subject: more random cleanup (nw) --- src/devices/machine/intelfsh.cpp | 8 ++++---- src/devices/machine/sunplus_gcm394.cpp | 13 ++++++------- src/devices/sound/ks0164.h | 4 ++-- src/devices/video/ppu2c0x_sh6578.cpp | 3 +-- src/mame/drivers/nes_sh6578.cpp | 4 ++-- src/mame/drivers/sunplus_unsp20soc.cpp | 2 -- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp index 8523eb61e24..027340e4736 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -739,15 +739,15 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data) logerror("Invalid flash mode byte %x\n", data & 0xff); else { - m_status = 0x80; - m_flash_mode = FM_READSTATUS; + m_status = 0x80; + m_flash_mode = FM_READSTATUS; } break; case 0x20: // block erase if (m_type == FLASH_SST_49LF020) logerror("Unknown flash mode byte %x\n", data & 0xff); else - m_flash_mode = FM_CLEARPART1; + m_flash_mode = FM_CLEARPART1; break; case 0x60: // set master lock m_flash_mode = FM_SETMASTER; @@ -923,7 +923,7 @@ void intelfsh_device::write_full(uint32_t address, uint32_t data) memset(&m_data[0x3C000], 0xff, 0x04000); } else - memset(&m_data[0], 0xff, m_size); + memset(&m_data[0], 0xff, m_size); m_status = 1 << 3; m_flash_mode = FM_ERASEAMD4; diff --git a/src/devices/machine/sunplus_gcm394.cpp b/src/devices/machine/sunplus_gcm394.cpp index ceef80a6776..303d334d221 100644 --- a/src/devices/machine/sunplus_gcm394.cpp +++ b/src/devices/machine/sunplus_gcm394.cpp @@ -10,12 +10,11 @@ #include "sunplus_gcm394.h" - -#define LOG_GCM394_SPI (1U << 4) -#define LOG_GCM394_IO (1U << 3) -#define LOG_GCM394_SYSDMA (1U << 2) -#define LOG_GCM394 (1U << 1) -#define LOG_GCM394_UNMAPPED (1U << 0) +#define LOG_GCM394_SPI (1U << 5) +#define LOG_GCM394_IO (1U << 4) +#define LOG_GCM394_SYSDMA (1U << 3) +#define LOG_GCM394 (1U << 2) +#define LOG_GCM394_UNMAPPED (1U << 1) #define VERBOSE (LOG_GCM394 | LOG_GCM394_UNMAPPED | LOG_GCM394_SYSDMA) #include "logmacro.h" @@ -124,7 +123,7 @@ READ16_MEMBER(sunplus_gcm394_base_device::system_dma_status_r) // bit 0 = channel 0 ready // bit 1 = channel 1 ready - return 0x00FF; + return 0x00ff; } void sunplus_gcm394_base_device::trigger_systemm_dma(address_space &space, int channel) diff --git a/src/devices/sound/ks0164.h b/src/devices/sound/ks0164.h index a89d30b96d0..19167a712d9 100644 --- a/src/devices/sound/ks0164.h +++ b/src/devices/sound/ks0164.h @@ -3,8 +3,8 @@ // Samsung KS0164 wavetable chip -#ifndef DEVICES_SOUND_KS0164_H -#define DEVICES_SOUND_KS0164_H +#ifndef MAME_SOUND_KS0164_H +#define MAME_SOUND_KS0164_H #pragma once diff --git a/src/devices/video/ppu2c0x_sh6578.cpp b/src/devices/video/ppu2c0x_sh6578.cpp index 0514d7dcc8d..c74fa5e54fb 100644 --- a/src/devices/video/ppu2c0x_sh6578.cpp +++ b/src/devices/video/ppu2c0x_sh6578.cpp @@ -7,10 +7,9 @@ #include "emu.h" #include "video/ppu2c0x_sh6578.h" -#define LOG_PPU_EXTRA (1U << 0) +#define LOG_PPU_EXTRA (1U << 1) //#define VERBOSE (LOG_PPU_EXTRA) -#define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp index e7c3599361c..e516ab685a3 100644 --- a/src/mame/drivers/nes_sh6578.cpp +++ b/src/mame/drivers/nes_sh6578.cpp @@ -20,8 +20,8 @@ #include "machine/bankdev.h" #include "machine/timer.h" -#define LOG_DMA (1U << 1) -#define LOG_PPU (1U << 0) +#define LOG_DMA (1U << 2) +#define LOG_PPU (1U << 1) //#define VERBOSE (LOG_PPU) #define VERBOSE (0) diff --git a/src/mame/drivers/sunplus_unsp20soc.cpp b/src/mame/drivers/sunplus_unsp20soc.cpp index 84dc1335cae..d79b870d93a 100644 --- a/src/mame/drivers/sunplus_unsp20soc.cpp +++ b/src/mame/drivers/sunplus_unsp20soc.cpp @@ -1873,5 +1873,3 @@ void generalplus_gpspispi_game_state::init_spi() CONS(200?, bkrankp, 0, 0, generalplus_gpspispi_bkrankp, gcm394, generalplus_gpspispi_bkrankp_game_state , init_spi, "Bandai", "Karaoke Ranking Party (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) - - -- cgit v1.2.3 From ebbb2b39cb1f44ab3ff1656ab6ddef9029237687 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 6 Apr 2020 03:37:22 +1000 Subject: (nw) random cleanup: * xavix2.cpp: better to be exception safe with allocations * williams.cpp: group the numbers in eights so it's easier to visually find a particular index, and restore the styling of the file (two blank lines between functions, three blank lines between sections) --- src/mame/drivers/xavix2.cpp | 5 +- src/mame/includes/williams.h | 9 +- src/mame/video/williams.cpp | 325 ++++++++----------------------------------- 3 files changed, 65 insertions(+), 274 deletions(-) diff --git a/src/mame/drivers/xavix2.cpp b/src/mame/drivers/xavix2.cpp index 7d17e36658f..bb0f3d638df 100644 --- a/src/mame/drivers/xavix2.cpp +++ b/src/mame/drivers/xavix2.cpp @@ -313,12 +313,12 @@ void xavix2_state::gpu1_trigger_w(u8 data) void xavix2_state::gpu_update(u16 count, u16 adr) { - int *list = new int[count]; + std::unique_ptr list(new int[count]); for(u32 i=0; i != count; i++) { u64 command = m_maincpu->space(AS_PROGRAM).read_qword(adr + 8*i); list[i] = (command & 0x1fe00000) | i; } - std::sort(list, list + count, std::greater()); + std::sort(list.get(), list.get() + count, std::greater()); for(u32 i=0; i != count; i++) { u64 command = m_maincpu->space(AS_PROGRAM).read_qword(adr + 8*(list[i] & 0xffff)); logerror("gpu %02d: %016x x=%03x y=%03x ?=%02x ?=%x s=%02x w=%02x h=%02x c=%04x %s\n", @@ -370,7 +370,6 @@ void xavix2_state::gpu_update(u16 count, u16 adr) } } } - delete[] list; } void xavix2_state::gpu_descsize_w(u16 data) diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 22948219698..696d10c55f2 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -315,17 +315,18 @@ public: m_bank8000(*this, "bank8000"), m_gfxdecode(*this, "gfxdecode"), m_tileram(*this, "williams2_tile"), - m_gain({0.8f, 0.73f, 0.81f}), - m_offset({-0.27f, 0.0f, -0.22f}) + m_gain({ 0.8f, 0.73f, 0.81f }), + m_offset({ -0.27f, 0.0f, -0.22f }) { } void williams2_base(machine_config &config); + INPUT_CHANGED_MEMBER(rgb_gain) { if (param < 3) - m_gain[param] = (float) newval / 100.0f; + m_gain[param] = float(newval) / 100.0f; else - m_offset[param-3] = (float) newval / 100.0f - 1.0f; + m_offset[param - 3] = (float(newval) / 100.0f) - 1.0f; rebuild_palette(); } diff --git a/src/mame/video/williams.cpp b/src/mame/video/williams.cpp index f6658a6391b..c846df713f1 100644 --- a/src/mame/video/williams.cpp +++ b/src/mame/video/williams.cpp @@ -273,6 +273,7 @@ uint32_t blaster_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } + uint32_t williams2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { rgb_t pens[16]; @@ -304,6 +305,7 @@ uint32_t williams2_state::screen_update(screen_device &screen, bitmap_rgb32 &bit return 0; } + uint32_t mysticm_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { rgb_t pens[16]; @@ -337,6 +339,8 @@ uint32_t mysticm_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } + + /************************************* * * Williams palette I/O @@ -368,6 +372,7 @@ void williams_state::palette_init(palette_device &palette) const } } + rgb_t williams2_state::calc_col(uint16_t lo, uint16_t hi) { /* @@ -390,289 +395,69 @@ rgb_t williams2_state::calc_col(uint16_t lo, uint16_t hi) static const float frgb[256] = { - 0.001889f, - 0.002456f, - 0.003196f, - 0.004384f, - 0.005272f, - 0.007672f, - 0.011345f, - 0.017759f, - 0.018643f, - 0.03103f, - 0.051912f, - 0.087251f, - 0.1256f, - 0.204967f, - 0.331644f, - 0.529628f, - 0.002524f, - 0.003306f, - 0.004371f, - 0.006072f, - 0.007386f, - 0.010812f, - 0.016096f, - 0.02509f, - 0.02687f, - 0.043747f, - 0.070899f, - 0.114042f, - 0.159992f, - 0.250108f, - 0.391104f, - 0.607433f, - 0.003522f, - 0.004666f, - 0.006254f, - 0.008766f, - 0.010795f, - 0.015856f, - 0.023585f, - 0.036228f, - 0.039487f, - 0.062206f, - 0.096916f, - 0.148811f, - 0.20338f, - 0.305447f, - 0.462741f, - 0.700199f, - 0.004941f, - 0.006607f, - 0.00895f, - 0.012619f, - 0.015683f, - 0.022944f, - 0.033832f, - 0.050765f, - 0.056018f, - 0.085033f, - 0.127452f, - 0.187886f, - 0.25112f, - 0.364998f, - 0.53879f, - 0.797876f, - 0.006857f, - 0.009233f, - 0.012592f, - 0.017771f, - 0.022172f, - 0.03212f, - 0.046615f, - 0.06811f, - 0.075696f, - 0.110906f, - 0.160678f, - 0.229149f, - 0.300735f, - 0.42593f, - 0.61584f, - 0.896241f, - 0.010113f, - 0.01368f, - 0.018726f, - 0.02625f, - 0.032735f, - 0.046462f, - 0.065809f, - 0.092996f, - 0.103803f, - 0.146292f, - 0.204648f, - 0.282479f, - 0.364084f, - 0.502781f, - 0.712244f, - 1.018759f, - 0.015744f, - 0.021251f, - 0.028944f, - 0.039945f, - 0.049446f, - 0.068127f, - 0.093445f, - 0.127285f, - 0.14231f, - 0.193004f, - 0.261153f, - 0.349656f, - 0.443068f, - 0.597642f, - 0.830444f, - 1.168267f, - 0.024223f, - 0.032378f, - 0.043467f, - 0.058612f, - 0.071646f, - 0.09563f, - 0.127147f, - 0.167588f, - 0.187237f, - 0.246001f, - 0.32398f, - 0.423282f, - 0.528958f, - 0.699986f, - 0.957283f, - 1.328146f, - 0.03429f, - 0.045182f, - 0.059626f, - 0.078588f, - 0.094882f, - 0.123449f, - 0.160233f, - 0.206173f, - 0.230031f, - 0.295596f, - 0.382005f, - 0.490617f, - 0.607092f, - 0.792615f, - 1.071663f, - 1.471949f, - 0.053106f, - 0.068185f, - 0.087712f, - 0.112105f, - 0.132967f, - 0.167685f, - 0.211656f, - 0.265082f, - 0.295044f, - 0.369837f, - 0.467993f, - 0.58972f, - 0.721623f, - 0.927771f, - 1.23799f, - 1.680648f, - 0.083576f, - 0.103924f, - 0.129726f, - 0.160516f, - 0.186838f, - 0.228722f, - 0.281144f, - 0.343382f, - 0.381103f, - 0.46708f, - 0.5795f, - 0.717377f, - 0.86859f, - 1.100548f, - 1.449999f, - 1.946101f, - 0.124032f, - 0.149904f, - 0.182177f, - 0.219335f, - 0.251408f, - 0.300484f, - 0.361692f, - 0.433113f, - 0.479348f, - 0.577076f, - 0.704911f, - 0.860274f, - 1.032601f, - 1.292736f, - 1.685276f, - 2.240223f, - 0.175706f, - 0.207011f, - 0.245689f, - 0.289706f, - 0.327912f, - 0.384501f, - 0.455038f, - 0.536297f, - 0.592068f, - 0.702442f, - 0.847309f, - 1.021943f, - 1.217772f, - 1.509243f, - 1.949852f, - 2.570528f, - 0.24927f, - 0.287025f, - 0.333877f, - 0.385984f, - 0.431717f, - 0.497443f, - 0.579727f, - 0.673464f, - 0.741572f, - 0.868017f, - 1.034559f, - 1.234123f, - 1.460333f, - 1.79207f, - 2.295118f, - 3.001228f, - 0.357357f, - 0.403448f, - 0.460931f, - 0.52375f, - 0.579557f, - 0.656404f, - 0.754715f, - 0.865436f, - 0.950203f, - 1.097887f, - 1.293872f, - 1.527752f, - 1.795589f, - 2.182008f, - 2.770169f, - 3.593798f, - 0.494255f, - 0.549094f, - 0.61884f, - 0.693823f, - 0.760527f, - 0.851544f, - 0.968276f, - 1.098965f, - 1.203912f, - 1.377026f, - 1.608183f, - 1.882244f, - 2.200036f, - 2.652345f, - 3.342626f, - 4.215708f, + 0.001889f, 0.002456f, 0.003196f, 0.004384f, 0.005272f, 0.007672f, 0.011345f, 0.017759f, + 0.018643f, 0.03103f, 0.051912f, 0.087251f, 0.1256f, 0.204967f, 0.331644f, 0.529628f, + 0.002524f, 0.003306f, 0.004371f, 0.006072f, 0.007386f, 0.010812f, 0.016096f, 0.02509f, + 0.02687f, 0.043747f, 0.070899f, 0.114042f, 0.159992f, 0.250108f, 0.391104f, 0.607433f, + 0.003522f, 0.004666f, 0.006254f, 0.008766f, 0.010795f, 0.015856f, 0.023585f, 0.036228f, + 0.039487f, 0.062206f, 0.096916f, 0.148811f, 0.20338f, 0.305447f, 0.462741f, 0.700199f, + 0.004941f, 0.006607f, 0.00895f, 0.012619f, 0.015683f, 0.022944f, 0.033832f, 0.050765f, + 0.056018f, 0.085033f, 0.127452f, 0.187886f, 0.25112f, 0.364998f, 0.53879f, 0.797876f, + + 0.006857f, 0.009233f, 0.012592f, 0.017771f, 0.022172f, 0.03212f, 0.046615f, 0.06811f, + 0.075696f, 0.110906f, 0.160678f, 0.229149f, 0.300735f, 0.42593f, 0.61584f, 0.896241f, + 0.010113f, 0.01368f, 0.018726f, 0.02625f, 0.032735f, 0.046462f, 0.065809f, 0.092996f, + 0.103803f, 0.146292f, 0.204648f, 0.282479f, 0.364084f, 0.502781f, 0.712244f, 1.018759f, + 0.015744f, 0.021251f, 0.028944f, 0.039945f, 0.049446f, 0.068127f, 0.093445f, 0.127285f, + 0.14231f, 0.193004f, 0.261153f, 0.349656f, 0.443068f, 0.597642f, 0.830444f, 1.168267f, + 0.024223f, 0.032378f, 0.043467f, 0.058612f, 0.071646f, 0.09563f, 0.127147f, 0.167588f, + 0.187237f, 0.246001f, 0.32398f, 0.423282f, 0.528958f, 0.699986f, 0.957283f, 1.328146f, + + 0.03429f, 0.045182f, 0.059626f, 0.078588f, 0.094882f, 0.123449f, 0.160233f, 0.206173f, + 0.230031f, 0.295596f, 0.382005f, 0.490617f, 0.607092f, 0.792615f, 1.071663f, 1.471949f, + 0.053106f, 0.068185f, 0.087712f, 0.112105f, 0.132967f, 0.167685f, 0.211656f, 0.265082f, + 0.295044f, 0.369837f, 0.467993f, 0.58972f, 0.721623f, 0.927771f, 1.23799f, 1.680648f, + 0.083576f, 0.103924f, 0.129726f, 0.160516f, 0.186838f, 0.228722f, 0.281144f, 0.343382f, + 0.381103f, 0.46708f, 0.5795f, 0.717377f, 0.86859f, 1.100548f, 1.449999f, 1.946101f, + 0.124032f, 0.149904f, 0.182177f, 0.219335f, 0.251408f, 0.300484f, 0.361692f, 0.433113f, + 0.479348f, 0.577076f, 0.704911f, 0.860274f, 1.032601f, 1.292736f, 1.685276f, 2.240223f, + + 0.175706f, 0.207011f, 0.245689f, 0.289706f, 0.327912f, 0.384501f, 0.455038f, 0.536297f, + 0.592068f, 0.702442f, 0.847309f, 1.021943f, 1.217772f, 1.509243f, 1.949852f, 2.570528f, + 0.24927f, 0.287025f, 0.333877f, 0.385984f, 0.431717f, 0.497443f, 0.579727f, 0.673464f, + 0.741572f, 0.868017f, 1.034559f, 1.234123f, 1.460333f, 1.79207f, 2.295118f, 3.001228f, + 0.357357f, 0.403448f, 0.460931f, 0.52375f, 0.579557f, 0.656404f, 0.754715f, 0.865436f, + 0.950203f, 1.097887f, 1.293872f, 1.527752f, 1.795589f, 2.182008f, 2.770169f, 3.593798f, + 0.494255f, 0.549094f, 0.61884f, 0.693823f, 0.760527f, 0.851544f, 0.968276f, 1.098965f, + 1.203912f, 1.377026f, 1.608183f, 1.882244f, 2.200036f, 2.652345f, 3.342626f, 4.215708f }; - uint16_t i, ur, ug, ub; - float r, g, b; - /* update the palette entry */ + // update the palette entry - i = (hi >> 4) & 15; - ub = (hi >> 0) & 15; - ug = (lo >> 4) & 15; - ur = (lo >> 0) & 15; + const uint16_t i = (hi >> 4) & 15; + const uint16_t ub = (hi >> 0) & 15; + const uint16_t ug = (lo >> 4) & 15; + const uint16_t ur = (lo >> 0) & 15; // normalize - r = frgb[i * 16 + ur] / 4.22f; - g = frgb[i * 16 + ug] / 4.22f; - b = frgb[i * 16 + ub] / 4.22f; + float r = frgb[i * 16 + ur] / 4.22f; + float g = frgb[i * 16 + ug] / 4.22f; + float b = frgb[i * 16 + ub] / 4.22f; + // cut off r = std::max(r + m_offset[0], 0.0f); g = std::max(g + m_offset[1], 0.0f); b = std::max(b + m_offset[2], 0.0f); + // drive r = std::min(r * m_gain[0] / 0.25f, 1.0f); g = std::min(g * m_gain[1] / 0.25f, 1.0f); b = std::min(b * m_gain[2] / 0.25f, 1.0f); - return rgb_t((int) (r * 255), (int) (g * 255), (int) (b * 255)); + return rgb_t(int(r * 255), int(g * 255), int(b * 255)); } + void williams2_state::paletteram_w(offs_t offset, u8 data) { uint16_t entry_lo, entry_hi; @@ -689,12 +474,14 @@ void williams2_state::paletteram_w(offs_t offset, u8 data) m_palette->set_pen_color(offset / 2, calc_col(entry_lo, entry_hi)); } + void williams2_state::rebuild_palette() { for (offs_t i=0; i<2048; i++) paletteram_w(i, m_paletteram[i]); } + void williams2_state::fg_select_w(u8 data) { m_fg_color = data & 0x3f; @@ -716,12 +503,14 @@ u8 williams_state::video_counter_r() return 0xfc; } + u8 williams2_state::video_counter_r() { return m_screen->vpos() & 0xff; } + /************************************* * * Tilemap handling @@ -740,6 +529,7 @@ TILE_GET_INFO_MEMBER(williams2_state::get_tile_info) tileinfo.set(0, data & mask, color, (data & ~mask) ? TILE_FLIPX : 0); } + int mysticm_state::color_decode(uint8_t base_col, int sig_J1, int y) { int v = y << 6; @@ -775,6 +565,7 @@ int mysticm_state::color_decode(uint8_t base_col, int sig_J1, int y) return (base_col & 0x3e) | color; } + TILE_GET_INFO_MEMBER(mysticm_state::get_tile_info) { int color = color_decode(m_bg_color, 0, (tile_index << 4) & 0xff); -- cgit v1.2.3 From c5c5723b9d5c19220825eaaebf4eb12e2f452a7a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 6 Apr 2020 03:42:38 +1000 Subject: version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 73f489916fc..c70f7f64575 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 2327ee23cb9..c756efaa1cb 100644 --- a/makefile +++ b/makefile @@ -1704,14 +1704,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.219"' > $@ + @echo '#define BARE_BUILD_VERSION "0.220"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.219" > $@ + @echo #define BARE_BUILD_VERSION "0.220" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3