diff options
Diffstat (limited to 'src/mame/drivers/srmp5.cpp')
-rw-r--r-- | src/mame/drivers/srmp5.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index 9ef4d397dfa..414d65e9829 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -137,7 +137,7 @@ private: uint32_t srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - int x,y,address,xs,xs2,ys,ys2,height,width,xw,yw,xb,yb,sizex,sizey; + int address,height,width,sizex,sizey; uint16_t *sprite_list=m_sprram.get(); uint16_t *sprite_list_end=&m_sprram[0x4000]; //guess uint8_t *pixels=(uint8_t *)m_tileram.get(); @@ -152,22 +152,22 @@ uint32_t srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &b { // 16x16 tile uint16_t *map = &sprram[0x2000]; - for(yw = 0; yw < tile_height; yw++) + for(int yw = 0; yw < tile_height; yw++) { - for(xw = 0; xw < tile_width; xw++) + for(int xw = 0; xw < tile_width; xw++) { uint16_t tile = map[yw * 128 + xw * 2]; if(tile >= 0x2000) continue; address = tile * SPRITE_DATA_GRANULARITY; - for(y = 0; y < 16; y++) + for(int y = 0; y < 16; y++) { - for(x = 0; x < 16; x++) + for(int x = 0; x < 16; x++) { uint8_t pen = pixels[BYTE_XOR_LE(address)]; if(pen) { - bitmap.pix32(yw * 16 + y, xw * 16 + x) = pens[pen]; + bitmap.pix(yw * 16 + y, xw * 16 + x) = pens[pen]; } address++; } @@ -191,8 +191,8 @@ uint32_t srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &b global_y=(int16_t)sprite_list[SPRITE_GLOBAL_Y]; while(sublist_length) { - x=(int16_t)sprite_sublist[SPRITE_LOCAL_X]+global_x; - y=(int16_t)sprite_sublist[SPRITE_LOCAL_Y]+global_y; + int x=(int16_t)sprite_sublist[SPRITE_LOCAL_X]+global_x; + int y=(int16_t)sprite_sublist[SPRITE_LOCAL_Y]+global_y; width =(sprite_sublist[SPRITE_SIZE]>> 4)&0xf; height=(sprite_sublist[SPRITE_SIZE]>>12)&0xf; @@ -201,24 +201,24 @@ uint32_t srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &b address=(sprite_sublist[SPRITE_TILE] & ~(sprite_sublist[SPRITE_SIZE] >> 11 & 7))*SPRITE_DATA_GRANULARITY; y -= (height + 1) * (sizey + 1)-1; - for(xw=0;xw<=width;xw++) + for(int xw=0;xw<=width;xw++) { - xb = (sprite_sublist[SPRITE_PALETTE] & 0x8000) ? (width-xw)*(sizex+1)+x: xw*(sizex+1)+x; - for(yw=0;yw<=height;yw++) + int xb = (sprite_sublist[SPRITE_PALETTE] & 0x8000) ? (width-xw)*(sizex+1)+x: xw*(sizex+1)+x; + for(int yw=0;yw<=height;yw++) { - yb = yw*(sizey+1)+y; - for(ys=0;ys<=sizey;ys++) + int yb = yw*(sizey+1)+y; + for(int ys=0;ys<=sizey;ys++) { - ys2 = (sprite_sublist[SPRITE_PALETTE] & 0x4000) ? ys : (sizey - ys); - for(xs=0;xs<=sizex;xs++) + int ys2 = (sprite_sublist[SPRITE_PALETTE] & 0x4000) ? ys : (sizey - ys); + for(int xs=0;xs<=sizex;xs++) { uint8_t pen=pixels[BYTE_XOR_LE(address)&(0x100000-1)]; - xs2 = (sprite_sublist[SPRITE_PALETTE] & 0x8000) ? (sizex - xs) : xs; + int xs2 = (sprite_sublist[SPRITE_PALETTE] & 0x8000) ? (sizex - xs) : xs; if(pen) { if(cliprect.contains(xb+xs2, yb+ys2)) { - bitmap.pix32(yb+ys2, xb+xs2) = pens[pen+((sprite_sublist[SPRITE_PALETTE]&0xff)<<8)]; + bitmap.pix(yb+ys2, xb+xs2) = pens[pen+((sprite_sublist[SPRITE_PALETTE]&0xff)<<8)]; } } ++address; @@ -235,8 +235,7 @@ uint32_t srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &b #ifdef DEBUG_CHAR { - int i; - for(i = 0; i < 0x2000; i++) + for(int i = 0; i < 0x2000; i++) { if (m_tileduty[i] == 1) { |