From f7cb5667e8ef6aa284078a64efe3dc15ca1b139e Mon Sep 17 00:00:00 2001 From: Brandon Wright Date: Thu, 10 Oct 2019 17:59:16 -0500 Subject: [PATCH] Fix Mode7 mosaic glitch from tile cleanup. --- tileimpl-h2x1.cpp | 2 +- tileimpl-n1x1.cpp | 2 +- tileimpl-n2x1.cpp | 2 +- tileimpl.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tileimpl-h2x1.cpp b/tileimpl-h2x1.cpp index d2cf1bf6..37143add 100644 --- a/tileimpl-h2x1.cpp +++ b/tileimpl-h2x1.cpp @@ -10,7 +10,7 @@ namespace TileImpl { template - void HiresBase::Draw(uint8 N, uint8 M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2) + void HiresBase::Draw(int N, int M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2) { if (Z1 > GFX.DB[Offset + 2 * N] && (M)) { diff --git a/tileimpl-n1x1.cpp b/tileimpl-n1x1.cpp index 9a9c900f..1c37c600 100644 --- a/tileimpl-n1x1.cpp +++ b/tileimpl-n1x1.cpp @@ -10,7 +10,7 @@ namespace TileImpl { template - void Normal1x1Base::Draw(uint8 N, uint8 M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2) + void Normal1x1Base::Draw(int N, int M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2) { (void) OffsetInLine; if (Z1 > GFX.DB[Offset + N] && (M)) diff --git a/tileimpl-n2x1.cpp b/tileimpl-n2x1.cpp index cf688f9d..4025c694 100644 --- a/tileimpl-n2x1.cpp +++ b/tileimpl-n2x1.cpp @@ -10,7 +10,7 @@ namespace TileImpl { template - void Normal2x1Base::Draw(uint8 N, uint8 M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2) + void Normal2x1Base::Draw(int N, int M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2) { (void) OffsetInLine; if (Z1 > GFX.DB[Offset + 2 * N] && (M)) diff --git a/tileimpl.h b/tileimpl.h index 9b7e86d4..6ebfa4ff 100644 --- a/tileimpl.h +++ b/tileimpl.h @@ -38,7 +38,7 @@ namespace TileImpl { enum { Pitch = BPSTART::Pitch }; typedef BPSTART bpstart_t; - static void Draw(uint8 N, uint8 M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2); + static void Draw(int N, int M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2); }; template @@ -52,7 +52,7 @@ namespace TileImpl { enum { Pitch = BPSTART::Pitch }; typedef BPSTART bpstart_t; - static void Draw(uint8 N, uint8 M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2); + static void Draw(int N, int M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2); }; template @@ -75,7 +75,7 @@ namespace TileImpl { enum { Pitch = BPSTART::Pitch }; typedef BPSTART bpstart_t; - static void Draw(uint8 N, uint8 M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2); + static void Draw(int N, int M, uint32 Offset, uint32 OffsetInLine, uint8 Pix, uint8 Z1, uint8 Z2); }; template