Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-26 22:29:10 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

revert prev commit for now...

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2013-06-11 17:50:59 +00:00
parent d344421d9f
commit a37368c80d
4 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mame/drivers/galaxian.c
View File

@ -2759,7 +2759,6 @@ void galaxian_state::common_init(galaxian_draw_bullet_func draw_bullet,galaxian_
{ {
m_irq_enabled = 0; m_irq_enabled = 0;
m_irq_line = INPUT_LINE_NMI; m_irq_line = INPUT_LINE_NMI;
m_color_resnet_type = GALAXIAN_RESNET_TYPE_MIDWAY;
m_numspritegens = 1; m_numspritegens = 1;
m_bullets_base = 0x60; m_bullets_base = 0x60;
m_sprites_base = 0x40; m_sprites_base = 0x40;
@ -2795,15 +2794,6 @@ DRIVER_INIT_MEMBER(galaxian_state,galaxian)
} }
DRIVER_INIT_MEMBER(galaxian_state,galaxiann)
{
DRIVER_INIT_CALL(galaxian);
/* Namco PCB had a slightly different color prom resnet */
m_color_resnet_type = GALAXIAN_RESNET_TYPE_NAMCO;
}
DRIVER_INIT_MEMBER(galaxian_state,nolock) DRIVER_INIT_MEMBER(galaxian_state,nolock)
{ {
address_space &space = m_maincpu->space(AS_PROGRAM); address_space &space = m_maincpu->space(AS_PROGRAM);
@ -3311,9 +3301,6 @@ DRIVER_INIT_MEMBER(galaxian_state,kingball)
/* video extensions */ /* video extensions */
common_init(&galaxian_state::galaxian_draw_bullet, &galaxian_state::galaxian_draw_background, NULL, NULL); common_init(&galaxian_state::galaxian_draw_bullet, &galaxian_state::galaxian_draw_background, NULL, NULL);
/* Namco PCB had a slightly different color prom resnet */
m_color_resnet_type = GALAXIAN_RESNET_TYPE_NAMCO;
/* disable the stars */ /* disable the stars */
space.unmap_write(0xb004, 0xb004, 0, 0x07f8); space.unmap_write(0xb004, 0xb004, 0, 0x07f8);

6
src/mame/drivers/galdrvr.c
View File

@ -6904,11 +6904,11 @@ ROM_END
*************************************/ *************************************/
/* basic galaxian hardware */ /* basic galaxian hardware */
GAME( 1979, galaxian, 0, galaxian, galaxian, galaxian_state, galaxiann, ROT90, "Namco", "Galaxian (Namco set 1)", GAME_SUPPORTS_SAVE ) GAME( 1979, galaxian, 0, galaxian, galaxian, galaxian_state, galaxian, ROT90, "Namco", "Galaxian (Namco set 1)", GAME_SUPPORTS_SAVE )
GAME( 1979, galaxiana, galaxian, galaxian, superg, galaxian_state, galaxiann, ROT90, "Namco", "Galaxian (Namco set 2)", GAME_SUPPORTS_SAVE ) GAME( 1979, galaxiana, galaxian, galaxian, superg, galaxian_state, galaxian, ROT90, "Namco", "Galaxian (Namco set 2)", GAME_SUPPORTS_SAVE )
GAME( 1979, galaxiant, galaxian, galaxian, superg, galaxian_state, galaxiann, ROT90, "Namco (Taito license)", "Galaxian (Taito)", GAME_SUPPORTS_SAVE )
GAME( 1979, galaxianm, galaxian, galaxian, galaxian, galaxian_state, galaxian, ROT90, "Namco (Midway license)", "Galaxian (Midway set 1)", GAME_SUPPORTS_SAVE ) GAME( 1979, galaxianm, galaxian, galaxian, galaxian, galaxian_state, galaxian, ROT90, "Namco (Midway license)", "Galaxian (Midway set 1)", GAME_SUPPORTS_SAVE )
GAME( 1979, galaxianmo, galaxian, galaxian, galaxian, galaxian_state, galaxian, ROT90, "Namco (Midway license)", "Galaxian (Midway set 2)", GAME_SUPPORTS_SAVE ) GAME( 1979, galaxianmo, galaxian, galaxian, galaxian, galaxian_state, galaxian, ROT90, "Namco (Midway license)", "Galaxian (Midway set 2)", GAME_SUPPORTS_SAVE )
GAME( 1979, galaxiant, galaxian, galaxian, superg, galaxian_state, galaxian, ROT90, "Namco (Taito license)", "Galaxian (Taito)", GAME_SUPPORTS_SAVE )
/* straight Galaxian ripoffs on basic galaxian hardware */ /* straight Galaxian ripoffs on basic galaxian hardware */
GAME( 1979, moonaln, galaxian, galaxian, superg, galaxian_state, galaxian, ROT90, "Namco / Nichibutsu (Karateco license?)", "Moon Alien", GAME_SUPPORTS_SAVE ) // or bootleg? GAME( 1979, moonaln, galaxian, galaxian, superg, galaxian_state, galaxian, ROT90, "Namco / Nichibutsu (Karateco license?)", "Moon Alien", GAME_SUPPORTS_SAVE ) // or bootleg?

8
src/mame/includes/galaxian.h
View File

@ -28,12 +28,6 @@
#define GALAXIAN_VBEND (16) #define GALAXIAN_VBEND (16)
#define GALAXIAN_VBSTART (224+16) #define GALAXIAN_VBSTART (224+16)
enum
{
GALAXIAN_RESNET_TYPE_MIDWAY,
GALAXIAN_RESNET_TYPE_NAMCO
};
class galaxian_state : public driver_device class galaxian_state : public driver_device
{ {
@ -59,7 +53,6 @@ public:
int m_bullets_base; int m_bullets_base;
int m_sprites_base; int m_sprites_base;
int m_numspritegens; int m_numspritegens;
int m_color_resnet_type;
int m_counter_74ls161[2]; int m_counter_74ls161[2];
int m_direction[2]; int m_direction[2];
UINT8 m_gmgalax_selected_game; UINT8 m_gmgalax_selected_game;
@ -189,7 +182,6 @@ public:
DECLARE_WRITE8_MEMBER(kingball_dac_w); DECLARE_WRITE8_MEMBER(kingball_dac_w);
DECLARE_WRITE8_MEMBER(moonwar_port_select_w); DECLARE_WRITE8_MEMBER(moonwar_port_select_w);
DECLARE_DRIVER_INIT(galaxian); DECLARE_DRIVER_INIT(galaxian);
DECLARE_DRIVER_INIT(galaxiann);
DECLARE_DRIVER_INIT(nolock); DECLARE_DRIVER_INIT(nolock);
DECLARE_DRIVER_INIT(azurian); DECLARE_DRIVER_INIT(azurian);
DECLARE_DRIVER_INIT(gmgalax); DECLARE_DRIVER_INIT(gmgalax);

28
src/mame/video/galaxian.c
View File

@ -236,9 +236,9 @@ H=B0: 0C,0C,0D,0D,0E,0E,0F,0F 0C,0C,2D,2D,0E,0E,2F,2F
void galaxian_state::palette_init() void galaxian_state::palette_init()
{ {
const UINT8 *color_prom = memregion("proms")->base(); const UINT8 *color_prom = memregion("proms")->base();
int rgb_resistances[3]; static const int rgb_resistances[3] = { 1000, 470, 220 };
double rweights[3], gweights[3], bweights[2]; double rweights[3], gweights[3], bweights[2];
int i, minval, midval, maxval, maxres, len; int i, minval, midval, maxval, len;
UINT8 starmap[4]; UINT8 starmap[4];
/* /*
@ -267,23 +267,6 @@ void galaxian_state::palette_init()
of the main game would be very low to allow for all the oversaturation of the main game would be very low to allow for all the oversaturation
of the stars and shells/missiles. of the stars and shells/missiles.
*/ */
// official Namco PCB used 330 ohm resistors instead of the 220 ohm ones
switch (m_color_resnet_type)
{
case GALAXIAN_RESNET_TYPE_NAMCO:
rgb_resistances[0] = 1000;
rgb_resistances[1] = 470;
rgb_resistances[2] = 330;
break;
default:
rgb_resistances[0] = 1000;
rgb_resistances[1] = 470;
rgb_resistances[2] = 220;
break;
}
compute_resistor_weights(0, RGB_MAXIMUM, -1.0, compute_resistor_weights(0, RGB_MAXIMUM, -1.0,
3, &rgb_resistances[0], rweights, 470, 0, 3, &rgb_resistances[0], rweights, 470, 0,
3, &rgb_resistances[0], gweights, 470, 0, 3, &rgb_resistances[0], gweights, 470, 0,
@ -330,10 +313,9 @@ void galaxian_state::palette_init()
Since we can't saturate that high, we instead approximate this Since we can't saturate that high, we instead approximate this
by compressing the values proportionally into the 194->255 range. by compressing the values proportionally into the 194->255 range.
*/ */
maxres = 1.0 / (1.0/rgb_resistances[0] + 1.0/rgb_resistances[1] + 1.0/rgb_resistances[2]); minval = RGB_MAXIMUM * 130 / 150;
minval = RGB_MAXIMUM * maxres / 150; midval = RGB_MAXIMUM * 130 / 100;
midval = RGB_MAXIMUM * maxres / 100; maxval = RGB_MAXIMUM * 130 / 60;
maxval = RGB_MAXIMUM * maxres / 60;
/* compute the values for each of 4 possible star values */ /* compute the values for each of 4 possible star values */
starmap[0] = 0; starmap[0] = 0;