summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-05-11 10:33:37 -0400
committer GitHub <noreply@github.com>2019-05-11 10:33:37 -0400
commitb329fa3125a5bbe92213374990e36861c196fe9b (patch)
treef42bd7f84b5509ab4286ea0e5397b2fc6dd498b6 /src
parent208f1aca88584c30eccb4e2eba7f608611c5f696 (diff)
parent485827b2f46d2eee28ae121907e757f544b6fabb (diff)
Merge pull request #5035 from cam900/galastrm_args
galastrm.cpp : Updates
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/galastrm.cpp23
-rw-r--r--src/mame/includes/galastrm.h26
-rw-r--r--src/mame/video/galastrm.cpp189
3 files changed, 111 insertions, 127 deletions
diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp
index c6545723810..cff62bb8df1 100644
--- a/src/mame/drivers/galastrm.cpp
+++ b/src/mame/drivers/galastrm.cpp
@@ -61,7 +61,7 @@ INTERRUPT_GEN_MEMBER(galastrm_state::interrupt)
}
template<int Chip>
-WRITE16_MEMBER(galastrm_state::tc0610_w)
+void galastrm_state::tc0610_w(offs_t offset, u16 data)
{
if (offset == 0)
m_tc0610_addr[Chip] = data;
@@ -75,7 +75,7 @@ CUSTOM_INPUT_MEMBER(galastrm_state::frame_counter_r)
return m_frame_counter;
}
-WRITE8_MEMBER(galastrm_state::coin_word_w)
+void galastrm_state::coin_word_w(u8 data)
{
machine().bookkeeping().coin_lockout_w(0, ~data & 0x01);
machine().bookkeeping().coin_lockout_w(1, ~data & 0x02);
@@ -158,10 +158,9 @@ static const gfx_layout tile16x16_layout =
16,16, /* 16*16 sprites */
RGN_FRAC(1,1),
4, /* 4 bits per pixel */
- { 0, 8, 16, 24 },
- { 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, 6, 7 },
- { 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64,
- 8*64, 9*64, 10*64, 11*64, 12*64, 13*64, 14*64, 15*64 },
+ { STEP4(0,8) },
+ { STEP8(8*4,1), STEP8(0,1) },
+ { STEP16(0,8*4*2) },
64*16 /* every sprite takes 128 consecutive bytes */
};
@@ -170,9 +169,9 @@ static const gfx_layout charlayout =
16,16, /* 16*16 characters */
RGN_FRAC(1,1),
4, /* 4 bits per pixel */
- { 0, 1, 2, 3 },
- { 3*4, 2*4, 7*4, 6*4, 1*4, 0*4, 5*4, 4*4, 11*4, 10*4, 15*4, 14*4, 9*4, 8*4, 13*4, 12*4 },
- { 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64, 8*64, 9*64, 10*64, 11*64, 12*64, 13*64, 14*64, 15*64 },
+ { STEP4(0,1) },
+ { STEP8(7*4,-4), STEP8(15*4,-4) },
+ { STEP16(0,16*4) },
128*8 /* every sprite takes 128 consecutive bytes */
};
@@ -223,7 +222,7 @@ void galastrm_state::galastrm(machine_config &config)
GFXDECODE(config, m_gfxdecode, m_tc0110pcr, gfx_galastrm);
TC0100SCN(config, m_tc0100scn, 0);
- m_tc0100scn->set_gfx_region(0);
+ m_tc0100scn->set_gfx_region(0); // TODO : no ROMs?
m_tc0100scn->set_offsets(-48, -56);
m_tc0100scn->set_gfxdecode_tag(m_gfxdecode);
m_tc0100scn->set_palette(m_tc0110pcr);
@@ -254,8 +253,8 @@ ROM_START( galastrm )
ROM_LOAD16_BYTE( "c99_22.ic7", 0x100001, 0x20000, CRC(b90f7c42) SHA1(e2fa9ee10ad61ae1a672c3357c0072b79ec7fbcb) )
ROM_REGION( 0x200000, "gfx1", 0 )
- ROM_LOAD16_BYTE( "c99-06.ic2", 0x000000, 0x100000, CRC(812ed3ae) SHA1(775904dd42643d0e3a30890590d5f8eac1fe78db) ) /* SCR 16x16 tiles */
- ROM_LOAD16_BYTE( "c99-05.ic1", 0x000001, 0x100000, CRC(a91ffba4) SHA1(467af9646ddad5fbb520b6bc13517ed4deacf479) )
+ ROM_LOAD32_WORD_SWAP( "c99-05.ic1", 0x000002, 0x100000, CRC(a91ffba4) SHA1(467af9646ddad5fbb520b6bc13517ed4deacf479) ) /* SCR 16x16 tiles */
+ ROM_LOAD32_WORD_SWAP( "c99-06.ic2", 0x000000, 0x100000, CRC(812ed3ae) SHA1(775904dd42643d0e3a30890590d5f8eac1fe78db) )
ROM_REGION( 0x400000, "gfx2", 0 )
ROM_LOAD32_BYTE( "c99-02.ic50", 0x000000, 0x100000, CRC(81e9fc6f) SHA1(4495a7d130b755b5a48eaa814d884d6bb8243bcb) ) /* OBJ 16x16 tiles */
diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h
index 6c7e4654d2a..ebdd626e48b 100644
--- a/src/mame/includes/galastrm.h
+++ b/src/mame/includes/galastrm.h
@@ -28,7 +28,7 @@ class galastrm_renderer : public poly_manager<float, gs_poly_data, 2, 10000>
public:
galastrm_renderer(galastrm_state &state);
- void tc0610_draw_scanline(int32_t scanline, const extent_t& extent, const gs_poly_data& object, int threadid);
+ void tc0610_draw_scanline(s32 scanline, const extent_t& extent, const gs_poly_data& object, int threadid);
void tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectangle &clip);
bitmap_ind16 &screenbits() { return m_screenbits; }
@@ -63,9 +63,9 @@ protected:
virtual void video_start() override;
private:
- required_shared_ptr<uint32_t> m_spriteram;
+ required_shared_ptr<u32> m_spriteram;
- required_region_ptr<uint16_t> m_spritemap_rom;
+ required_region_ptr<u16> m_spritemap_rom;
required_device<cpu_device> m_maincpu;
required_device<eeprom_serial_93cxx_device> m_eeprom;
@@ -77,17 +77,17 @@ private:
struct gs_tempsprite
{
- int gfx;
- int code,color;
- int flipx,flipy;
+ u8 gfx;
+ u32 code,color;
+ bool flipx,flipy;
int x,y;
int zoomx,zoomy;
- int primask;
+ u32 primask;
};
- uint16_t m_frame_counter;
+ u16 m_frame_counter;
int m_tc0610_addr[2];
- int16_t m_tc0610_ctrl_reg[2][8];
+ s16 m_tc0610_ctrl_reg[2][8];
std::unique_ptr<gs_tempsprite[]> m_spritelist;
struct gs_tempsprite *m_sprite_ptr_pre;
bitmap_ind16 m_tmpbitmaps;
@@ -98,12 +98,12 @@ private:
int m_rsxoffs;
int m_rsyoffs;
- template<int Chip> DECLARE_WRITE16_MEMBER(tc0610_w);
- DECLARE_WRITE8_MEMBER(coin_word_w);
- uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ template<int Chip> void tc0610_w(offs_t offset, u16 data);
+ void coin_word_w(u8 data);
+ u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(interrupt);
void draw_sprites_pre(int x_offs, int y_offs);
- void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const int *primasks, int priority);
+ void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const u32 *primasks, int priority);
void main_map(address_map &map);
};
diff --git a/src/mame/video/galastrm.cpp b/src/mame/video/galastrm.cpp
index 77863568fe9..07e23705512 100644
--- a/src/mame/video/galastrm.cpp
+++ b/src/mame/video/galastrm.cpp
@@ -84,41 +84,36 @@ Heavy use is made of sprite zooming.
void galastrm_state::draw_sprites_pre(int x_offs, int y_offs)
{
- int offs, data, tilenum, color, flipx, flipy;
- int x, y, priority, dblsize, curx, cury;
int sprites_flipscreen = 0;
- int zoomx, zoomy, zx, zy;
- int sprite_chunk,map_offset,code,j,k,px,py;
- int dimension,total_chunks,bad_chunks;
/* pdrawgfx() needs us to draw sprites front to back, so we have to build a list
while processing sprite ram and then draw them all at the end */
m_sprite_ptr_pre = m_spritelist.get();
- for (offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4)
+ for (int offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4)
{
- data = m_spriteram[offs+0];
- flipx = (data & 0x00800000) >> 23;
- zoomx = (data & 0x007f0000) >> 16;
- tilenum = (data & 0x00007fff);
+ u32 data = m_spriteram[offs+0];
+ int flipx = (data & 0x00800000) >> 23;
+ int zoomx = (data & 0x007f0000) >> 16;
+ const u32 tilenum = (data & 0x00007fff);
if (!tilenum) continue;
data = m_spriteram[offs+2];
- priority = (data & 0x000c0000) >> 18;
- color = (data & 0x0003fc00) >> 10;
- x = (data & 0x000003ff);
+ const int priority = (data & 0x000c0000) >> 18;
+ int color = (data & 0x0003fc00) >> 10;
+ int x = (data & 0x000003ff);
data = m_spriteram[offs+3];
- dblsize = (data & 0x00040000) >> 18;
- flipy = (data & 0x00020000) >> 17;
- zoomy = (data & 0x0001fc00) >> 10;
- y = (data & 0x000003ff);
+ const int dblsize = (data & 0x00040000) >> 18;
+ int flipy = (data & 0x00020000) >> 17;
+ int zoomy = (data & 0x0001fc00) >> 10;
+ int y = (data & 0x000003ff);
- bad_chunks = 0;
- dimension = ((dblsize*2) + 2); // 2 or 4
- total_chunks = ((dblsize*3) + 1) << 2; // 4 or 16
- map_offset = tilenum << 2;
+ int bad_chunks = 0;
+ const int dimension = ((dblsize * 2) + 2); // 2 or 4
+ const int total_chunks = ((dblsize * 3) + 1) << 2; // 4 or 16
+ const u32 map_offset = tilenum << 2;
zoomx += 1;
zoomy += 1;
@@ -131,30 +126,30 @@ void galastrm_state::draw_sprites_pre(int x_offs, int y_offs)
y += y_offs;
if (flipy) y += (128 - zoomy);
- for (sprite_chunk=0;sprite_chunk<total_chunks;sprite_chunk++)
+ for (int sprite_chunk = 0; sprite_chunk < total_chunks; sprite_chunk++)
{
- j = sprite_chunk / dimension; /* rows */
- k = sprite_chunk % dimension; /* chunks per row */
+ const int j = sprite_chunk / dimension; /* rows */
+ const int k = sprite_chunk % dimension; /* chunks per row */
- px = k;
- py = j;
+ int px = k;
+ int py = j;
/* pick tiles back to front for x and y flips */
- if (flipx) px = dimension-1-k;
- if (flipy) py = dimension-1-j;
+ if (flipx) px = dimension - 1 - k;
+ if (flipy) py = dimension - 1 - j;
- code = m_spritemap_rom[map_offset + px + (py<<(dblsize+1))];
+ const u16 code = m_spritemap_rom[map_offset + px + (py << (dblsize + 1))];
- if (code==0xffff)
+ if (code == 0xffff)
{
bad_chunks += 1;
continue;
}
- curx = x + ((k*zoomx)/dimension);
- cury = y + ((j*zoomy)/dimension);
+ int curx = x + ((k * zoomx) / dimension);
+ int cury = y + ((j * zoomy) / dimension);
- zx= x + (((k+1)*zoomx)/dimension) - curx;
- zy= y + (((j+1)*zoomy)/dimension) - cury;
+ const int zx = x + (((k + 1) * zoomx) / dimension) - curx;
+ const int zy = y + (((j + 1) * zoomy) / dimension) - cury;
if (sprites_flipscreen)
{
@@ -186,7 +181,7 @@ void galastrm_state::draw_sprites_pre(int x_offs, int y_offs)
}
}
-void galastrm_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const int *primasks, int priority)
+void galastrm_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const u32 *primasks, int priority)
{
struct gs_tempsprite *sprite_ptr = m_sprite_ptr_pre;
@@ -212,14 +207,14 @@ void galastrm_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c
POLYGON RENDERER
**************************************************************/
-void galastrm_renderer::tc0610_draw_scanline(int32_t scanline, const extent_t& extent, const gs_poly_data& object, int threadid)
+void galastrm_renderer::tc0610_draw_scanline(s32 scanline, const extent_t& extent, const gs_poly_data& object, int threadid)
{
- uint16_t *framebuffer = &m_screenbits.pix16(scanline);
- const int32_t dudx = extent.param[0].dpdx;
- const int32_t dvdx = extent.param[1].dpdx;
+ u16 *framebuffer = &m_screenbits.pix16(scanline);
+ const s32 dudx = extent.param[0].dpdx;
+ const s32 dvdx = extent.param[1].dpdx;
- int32_t u = extent.param[0].start;
- int32_t v = extent.param[1].start;
+ s32 u = extent.param[0].start;
+ s32 v = extent.param[1].start;
for (int x = extent.startx; x < extent.stopx; x++)
{
framebuffer[x] = object.texbase->pix16(v >> 16, u >> 16);
@@ -247,33 +242,30 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
const int lx = srcbitmap.width();
const int ly = srcbitmap.height();
- int yx, /*yy,*/ zx, zy, pxx, pxy, pyx, pyy;
- float /*ssn, scs, ysn, ycs,*/ zsn, zcs;
-
- pxx = 0;
- pxy = 0;
- pyx = 0;
- pyy = 0;
- zx = 0;
- zy = 0;
+ int pxx = 0;
+ int pxy = 0;
+ int pyx = 0;
+ int pyy = 0;
+ int zx = 0;
+ int zy = 0;
if (rzx != 0 || rzy != 0)
{
- while (sqrtf(powf((float)pxx/4096.0f, 2.0f) + powf((float)pxy/4096.0f, 2.0f)) < (float)(lx / 2))
+ while (sqrtf(powf((float)pxx / 4096.0f, 2.0f) + powf((float)pxy / 4096.0f, 2.0f)) < (float)(lx / 2))
{
pxx += rzx;
pxy += rzy;
zx++;
}
- while (sqrtf(powf((float)pyy/4096.0f, 2.0f) + powf((float)pyx/4096.0f, 2.0f)) < (float)(ly / 2))
+ while (sqrtf(powf((float)pyy / 4096.0f, 2.0f) + powf((float)pyx / 4096.0f, 2.0f)) < (float)(ly / 2))
{
pyy += rzx;
pyx += -rzy;
zy++;
}
}
- zsn = ((float)pyx/4096.0f) / (float)(ly / 2);
- zcs = ((float)pxx/4096.0f) / (float)(lx / 2);
+ float zsn = ((float)pyx / 4096.0f) / (float)(ly / 2);
+ float zcs = ((float)pxx / 4096.0f) / (float)(lx / 2);
if ((rsx == -240 && rsy == 1072) || !m_state.m_tc0610_ctrl_reg[1][7])
@@ -293,7 +285,7 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
if (rsx < m_state.m_rsxb && m_state.m_rsxb > 0 && m_state.m_rsxb-rsx > 0x8000)
{
if (m_state.m_rsxoffs == 0)
- m_state.m_rsxoffs = 0x10000-1;
+ m_state.m_rsxoffs = 0x10000 - 1;
else
m_state.m_rsxoffs = 0;
}
@@ -307,7 +299,7 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
if (rsy < m_state.m_rsyb && m_state.m_rsyb > 0 && m_state.m_rsyb-rsy > 0x8000)
{
if (m_state.m_rsyoffs == 0)
- m_state.m_rsyoffs = 0x10000-1;
+ m_state.m_rsyoffs = 0x10000 - 1;
else
m_state.m_rsyoffs = 0;
}
@@ -324,24 +316,24 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
pxy = 0;
pyx = 0;
pyy = 0;
- yx = 0;
- //yy = 0;
- //ssn = 0.0;
- //scs = 0.0;
- //ysn = 0.0;
- //ycs = 0.0;
+ int yx = 0;
+ //int yy = 0;
+ //float ssn = 0.0;
+ //float scs = 0.0;
+ //float ysn = 0.0;
+ //float ycs = 0.0;
if (m_state.m_tc0610_ctrl_reg[1][7])
{
if (ryx != 0 || ryy != 0)
{
- while (sqrtf(powf((float)pxx/4096.0f, 2.0f) + powf((float)pxy/4096.0f, 2.0f)) < (float)(lx / 2))
+ while (sqrtf(powf((float)pxx / 4096.0f, 2.0f) + powf((float)pxy / 4096.0f, 2.0f)) < (float)(lx / 2))
{
pxx += ryx;
pxy += ryy;
yx++;
}
- while (sqrtf(powf((float)pyy/4096.0f, 2.0f) + powf((float)pyx/4096.0f, 2.0f)) < (float)(ly / 2))
+ while (sqrtf(powf((float)pyy / 4096.0f, 2.0f) + powf((float)pyx / 4096.0f, 2.0f)) < (float)(ly / 2))
{
pyy += ryx;
pyx += -ryy;
@@ -362,12 +354,12 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
if (rsx != 0 || rsy != 0)
{
- while (sqrtf(powf((float)pxx/65536.0f, 2.0) + powf((float)pxy/65536.0f, 2.0f)) < (float)(lx / 2))
+ while (sqrtf(powf((float)pxx / 65536.0f, 2.0) + powf((float)pxy / 65536.0f, 2.0f)) < (float)(lx / 2))
{
pxx += rsx;
pxy += rsy;
}
- while (sqrtf(powf((float)pyy/65536.0f, 2.0f) + powf((float)pyx/65536.0f, 2.0f)) < (float)(ly / 2))
+ while (sqrtf(powf((float)pyy / 65536.0f, 2.0f) + powf((float)pyx / 65536.0f, 2.0f)) < (float)(ly / 2))
{
pyy += rsx;
pyx += -rsy;
@@ -379,17 +371,17 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
{
// polyVert tmpz[4];
- tmpz[0].x = ((float)(-zx) * zcs) - ((float)(-zy) * zsn);
- tmpz[0].y = ((float)(-zx) * zsn) + ((float)(-zy) * zcs);
+ tmpz[0].x = ((float)(-zx) * zcs) - ((float)(-zy) * zsn);
+ tmpz[0].y = ((float)(-zx) * zsn) + ((float)(-zy) * zcs);
// tmpz[0].z = 0.0;
- tmpz[1].x = ((float)(-zx) * zcs) - ((float)(zy-1) * zsn);
- tmpz[1].y = ((float)(-zx) * zsn) + ((float)(zy-1) * zcs);
+ tmpz[1].x = ((float)(-zx) * zcs) - ((float)(zy - 1) * zsn);
+ tmpz[1].y = ((float)(-zx) * zsn) + ((float)(zy - 1) * zcs);
// tmpz[1].z = 0.0;
- tmpz[2].x = ((float)(zx-1) * zcs) - ((float)(zy-1) * zsn);
- tmpz[2].y = ((float)(zx-1) * zsn) + ((float)(zy-1) * zcs);
+ tmpz[2].x = ((float)(zx - 1) * zcs) - ((float)(zy - 1) * zsn);
+ tmpz[2].y = ((float)(zx - 1) * zsn) + ((float)(zy - 1) * zcs);
// tmpz[2].z = 0.0;
- tmpz[3].x = ((float)(zx-1) * zcs) - ((float)(-zy) * zsn);
- tmpz[3].y = ((float)(zx-1) * zsn) + ((float)(-zy) * zcs);
+ tmpz[3].x = ((float)(zx - 1) * zcs) - ((float)(-zy) * zsn);
+ tmpz[3].y = ((float)(zx - 1) * zsn) + ((float)(-zy) * zcs);
// tmpz[3].z = 0.0;
vert[0].x = tmpz[0].x + (float)(lx / 2);
@@ -422,20 +414,19 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
SCREEN REFRESH
**************************************************************/
-uint32_t galastrm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 galastrm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- uint8_t layer[5];
- uint8_t pivlayer[3];
- uint16_t priority;
- static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
+ u8 layer[5];
+ u8 pivlayer[3];
+ static const u32 primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
bitmap_ind8 &priority_bitmap = screen.priority();
- rectangle clip(0, screen.width() -1, 0, screen.height() -1);
+ rectangle clip(0, screen.width() -1, 0, screen.height() - 1);
m_tc0100scn->tilemap_update();
m_tc0480scp->tilemap_update();
- priority = m_tc0480scp->get_bg_priority();
+ const u16 priority = m_tc0480scp->get_bg_priority();
layer[0] = (priority & 0xf000) >> 12; /* tells us which bg layer is bottom */
layer[1] = (priority & 0x0f00) >> 8;
layer[2] = (priority & 0x00f0) >> 4;
@@ -471,14 +462,11 @@ uint32_t galastrm_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
if (layer[0]==3 && layer[1]==0 && layer[2]==1 && layer[3]==2)
{
- int x,y;
- uint8_t *pri;
-
- for (y=0; y < priority_bitmap.height; y++)
+ for (int y = 0; y < priority_bitmap.height; y++)
{
- for (x=0; x < priority_bitmap.width; x++)
+ for (int x = 0; x < priority_bitmap.width; x++)
{
- pri = &priority_bitmap.pix8(y, x);
+ u8 *pri = &priority_bitmap.pix8(y, x);
if (!(*pri & 0x02) && m_tmpbitmaps.pix16(y, x))
*pri |= 0x04;
}
@@ -486,14 +474,14 @@ uint32_t galastrm_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
}
draw_sprites_pre(machine(), 42-X_OFFSET, -571+Y_OFFSET);
- draw_sprites(screen,m_tmpbitmaps,clip,primasks,1);
+ draw_sprites(screen, m_tmpbitmaps, clip, primasks, 1);
- copybitmap_trans(bitmap,m_polybitmap,0,0, 0,0,cliprect,0);
+ copybitmap_trans(bitmap, m_polybitmap, 0,0, 0,0, cliprect, 0);
m_polybitmap->fill(0, clip);
- tc0610_rotate_draw(machine(),m_polybitmap,m_tmpbitmaps,cliprect);
+ tc0610_rotate_draw(machine(), m_polybitmap, m_tmpbitmaps, cliprect);
priority_bitmap.fill(0, cliprect);
- draw_sprites(screen,bitmap,cliprect,primasks,0);
+ draw_sprites(screen, bitmap, cliprect, primasks, 0);
if (!machine().input().code_pressed(KEYCODE_B)) m_tc0480scp->tilemap_draw(screen, bitmap, cliprect, layer[4], 0, 0);
if (!machine().input().code_pressed(KEYCODE_M)) m_tc0100scn->tilemap_draw(screen, bitmap, cliprect, pivlayer[2], 0, 0);
@@ -501,7 +489,7 @@ uint32_t galastrm_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
#else
- if (layer[0]==0 && layer[1]==3 && layer[2]==2 && layer[3]==1)
+ if (layer[0] == 0 && layer[1] == 3 && layer[2] == 2 && layer[3] == 1)
{
m_tc0480scp->tilemap_draw(screen, m_tmpbitmaps, clip, layer[0], 0, 1);
m_tc0480scp->tilemap_draw(screen, m_tmpbitmaps, clip, layer[1], 0, 4);
@@ -516,31 +504,28 @@ uint32_t galastrm_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
m_tc0480scp->tilemap_draw(screen, m_tmpbitmaps, clip, layer[3], 0, 8);
}
- if (layer[0]==3 && layer[1]==0 && layer[2]==1 && layer[3]==2)
+ if (layer[0] == 3 && layer[1] == 0 && layer[2] == 1 && layer[3] == 2)
{
- int x,y;
- uint8_t *pri;
-
- for (y=0; y < priority_bitmap.height(); y++)
+ for (int y=0; y < priority_bitmap.height(); y++)
{
- for (x=0; x < priority_bitmap.width(); x++)
+ for (int x=0; x < priority_bitmap.width(); x++)
{
- pri = &priority_bitmap.pix8(y, x);
+ u8 *pri = &priority_bitmap.pix8(y, x);
if (!(*pri & 0x02) && m_tmpbitmaps.pix16(y, x))
*pri |= 0x04;
}
}
}
- draw_sprites_pre(42-X_OFFSET, -571+Y_OFFSET);
- draw_sprites(screen,m_tmpbitmaps,clip,primasks,1);
+ draw_sprites_pre(42 - X_OFFSET, -571 + Y_OFFSET);
+ draw_sprites(screen, m_tmpbitmaps, clip, primasks, 1);
copybitmap_trans(bitmap, m_poly->screenbits(), 0,0, 0,0, cliprect, 0);
m_poly->screenbits().fill(0, clip);
m_poly->tc0610_rotate_draw(m_tmpbitmaps, cliprect);
priority_bitmap.fill(0, cliprect);
- draw_sprites(screen,bitmap,cliprect,primasks,0);
+ draw_sprites(screen, bitmap, cliprect, primasks, 0);
m_tc0480scp->tilemap_draw(screen, bitmap, cliprect, layer[4], 0, 0);
m_tc0100scn->tilemap_draw(screen, bitmap, cliprect, pivlayer[2], 0, 0);