From 11ae82a30bc27be3e64eebf01b328ae9d719dcb6 Mon Sep 17 00:00:00 2001 From: Manuel K Date: Sun, 2 Jun 2019 17:10:26 +0200 Subject: [PATCH] Replace ROW_PITCH with BUFFER_WIDTH --- Source/asm_trans_rect.inc | 10 +++++----- defs.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/asm_trans_rect.inc b/Source/asm_trans_rect.inc index 12ef861a6..e34bb1ffe 100644 --- a/Source/asm_trans_rect.inc +++ b/Source/asm_trans_rect.inc @@ -15,7 +15,7 @@ __asm { mov edi, gpBuffer ; origin is at 64,160 - add edi, (160 + TRANS_RECT_Y + TRANS_RECT_HEIGHT - 1) * ROW_PITCH + 64 + TRANS_RECT_X + add edi, (160 + TRANS_RECT_Y + TRANS_RECT_HEIGHT - 1) * BUFFER_WIDTH + 64 + TRANS_RECT_X xor eax, eax mov edx, TRANS_RECT_HEIGHT >> 1 yloop: @@ -27,13 +27,13 @@ x0loop: #if (TRANS_RECT_WIDTH & 1) stosb #endif - sub edi, ROW_PITCH + TRANS_RECT_WIDTH + sub edi, BUFFER_WIDTH + TRANS_RECT_WIDTH mov ecx, TRANS_RECT_WIDTH >> 1 x1loop: inc edi stosb loop x1loop - sub edi, ROW_PITCH + (TRANS_RECT_WIDTH & ~1) + sub edi, BUFFER_WIDTH + (TRANS_RECT_WIDTH & ~1) dec edx jnz yloop #if (TRANS_RECT_HEIGHT & 1) @@ -59,12 +59,12 @@ x2loop: #if (TRANS_RECT_WIDTH & 1) *pix++ = 0; #endif - pix -= ROW_PITCH + TRANS_RECT_WIDTH; + pix -= BUFFER_WIDTH + TRANS_RECT_WIDTH; for (col = TRANS_RECT_WIDTH >> 1; col != 0; col--) { pix++; *pix++ = 0; } - pix -= ROW_PITCH + (TRANS_RECT_WIDTH & ~1); + pix -= BUFFER_WIDTH + (TRANS_RECT_WIDTH & ~1); } #if (TRANS_RECT_HEIGHT & 1) for (col = TRANS_RECT_WIDTH >> 1; col != 0; col--) { diff --git a/defs.h b/defs.h index 0087efac5..a8c1fe1e8 100644 --- a/defs.h +++ b/defs.h @@ -4,7 +4,6 @@ #define DMAXY 40 #define LIGHTSIZE 6912 // 27 * 256 -#define ROW_PITCH 768 // must be unsigned to generate unsigned comparisons with pnum #define MAX_PLRS 4