diff options
| author | João Silva | 2017-08-16 17:59:11 +0100 |
|---|---|---|
| committer | João Silva | 2017-08-16 17:59:11 +0100 |
| commit | aef91917f7ae66da1e93e1f4c1b21f5b2555ad35 (patch) | |
| tree | f1d740e45522954e48e036103268c5ccb5dcbef2 /source/tile.h | |
| parent | aa610b2ba997a945c77ce06e9a33638dedb480da (diff) | |
| download | snesemu-aef91917f7ae66da1e93e1f4c1b21f5b2555ad35.tar.gz snesemu-aef91917f7ae66da1e93e1f4c1b21f5b2555ad35.tar.bz2 snesemu-aef91917f7ae66da1e93e1f4c1b21f5b2555ad35.zip | |
Changed compile-time flags to use C89 and fixed new warnings raised.
Diffstat (limited to 'source/tile.h')
| -rw-r--r-- | source/tile.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/source/tile.h b/source/tile.h index ca9f854..1dbc1fa 100644 --- a/source/tile.h +++ b/source/tile.h @@ -3,15 +3,18 @@ #ifndef _TILE_H_ #define _TILE_H_ -#define TILE_PREAMBLE() \ +#define TILE_PREAMBLE_VARS() \ uint32_t l; \ uint16_t *ScreenColors; \ uint8_t *pCache; \ - uint32_t TileAddr = BG.TileAddress + ((Tile & 0x3ff) << BG.TileShift); \ + uint32_t TileNumber; \ + uint32_t TileAddr + +#define TILE_PREAMBLE_CODE() \ + TileAddr = BG.TileAddress + ((Tile & 0x3ff) << BG.TileShift); \ if ((Tile & 0x1ff) >= 256) \ TileAddr += BG.NameSelect; \ TileAddr &= 0xffff; \ - uint32_t TileNumber; \ pCache = &BG.Buffer[(TileNumber = (TileAddr >> BG.TileShift)) << 6]; \ if (!BG.Buffered [TileNumber]) \ BG.Buffered[TileNumber] = ConvertTile (pCache, TileAddr); \ @@ -73,12 +76,14 @@ break; \ } -#define TILE_CLIP_PREAMBLE() \ +#define TILE_CLIP_PREAMBLE_VARS() \ uint32_t d1; \ - uint32_t d2; \ + uint32_t d2 + +#define TILE_CLIP_PREAMBLE_CODE() \ if (StartPixel < 4) \ { \ - d1 = HeadMask [StartPixel]; \ + d1 = HeadMask [StartPixel]; \ if (StartPixel + Width < 4) \ d1 &= TailMask [StartPixel + Width]; \ } \ @@ -95,8 +100,10 @@ else \ d2 = 0 -#define RENDER_CLIPPED_TILE(NORMAL, FLIPPED, N) \ - uint32_t dd; \ +#define RENDER_CLIPPED_TILE_VARS() \ + uint32_t dd + +#define RENDER_CLIPPED_TILE_CODE(NORMAL, FLIPPED, N) \ switch (Tile & (V_FLIP | H_FLIP)) \ { \ case 0: \ |