From e25e15ac1d6662eb29be461a2931260fae1dd0a6 Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Mon, 9 Mar 2020 12:33:39 +0100 Subject: [PATCH] Make XGA_GetMixResult a static function --- src/hardware/vga_xga.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hardware/vga_xga.cpp b/src/hardware/vga_xga.cpp index da437a0d..0f7b69fe 100644 --- a/src/hardware/vga_xga.cpp +++ b/src/hardware/vga_xga.cpp @@ -183,8 +183,8 @@ Bitu XGA_GetPoint(Bitu x, Bitu y) { return 0; } - -Bitu XGA_GetMixResult(Bitu mixmode, Bitu srcval, Bitu dstdata) { +static Bitu GetMixResult(Bitu mixmode, Bitu srcval, Bitu dstdata) +{ Bitu destval = 0; switch(mixmode & 0xf) { case 0x00: /* not DST */ @@ -320,7 +320,7 @@ void XGA_DrawLineVector(Bitu val) { } dstdata = XGA_GetPoint(xat,yat); - destval = XGA_GetMixResult(mixmode, srcval, dstdata); + destval = GetMixResult(mixmode, srcval, dstdata); XGA_DrawPoint(xat,yat, destval); break; @@ -419,7 +419,7 @@ void XGA_DrawLineBresenham(Bitu val) { dstdata = XGA_GetPoint(yat,xat); } - destval = XGA_GetMixResult(mixmode, srcval, dstdata); + destval = GetMixResult(mixmode, srcval, dstdata); if(steep) { XGA_DrawPoint(xat,yat, destval); @@ -496,7 +496,7 @@ void XGA_DrawRectangle(Bitu val) { } dstdata = XGA_GetPoint(srcx,srcy); - destval = XGA_GetMixResult(mixmode, srcval, dstdata); + destval = GetMixResult(mixmode, srcval, dstdata); XGA_DrawPoint(srcx,srcy, destval); break; @@ -561,7 +561,7 @@ void XGA_DrawWaitSub(Bitu mixmode, Bitu srcval) { Bitu destval; Bitu dstdata; dstdata = XGA_GetPoint(xga.waitcmd.curx, xga.waitcmd.cury); - destval = XGA_GetMixResult(mixmode, srcval, dstdata); + destval = GetMixResult(mixmode, srcval, dstdata); //LOG_MSG("XGA: DrawPattern: Mixmode: %x srcval: %x", mixmode, srcval); XGA_DrawPoint(xga.waitcmd.curx, xga.waitcmd.cury, destval); @@ -796,7 +796,7 @@ void XGA_BlitRect(Bitu val) { break; } - destval = XGA_GetMixResult(mixmode, srcval, dstdata); + destval = GetMixResult(mixmode, srcval, dstdata); //LOG_MSG("XGA: DrawPattern: Mixmode: %x Mixselect: %x", mixmode, mixselect); XGA_DrawPoint(tarx, tary, destval); @@ -882,7 +882,7 @@ void XGA_DrawPattern(Bitu val) { break; } - destval = XGA_GetMixResult(mixmode, srcval, dstdata); + destval = GetMixResult(mixmode, srcval, dstdata); XGA_DrawPoint(tarx, tary, destval);