mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Revert "Add if conditional for !(uiFlags & TILES_DIRTY)"
This reverts commit b49c37e0a9.
This commit is contained in:
Asdow
+98
-100
@@ -4323,124 +4323,122 @@ static void RenderTiles(UINT32 uiFlags, INT32 iStartPointX_M, INT32 iStartPointY
|
||||
{
|
||||
|
||||
}
|
||||
else if ( !(uiFlags & TILES_DIRTY) )
|
||||
else if (uiLevelNodeFlags & LEVELNODE_DISPLAY_AP && !(uiFlags & TILES_DIRTY))
|
||||
{
|
||||
if ( uiLevelNodeFlags & LEVELNODE_DISPLAY_AP )
|
||||
{
|
||||
pTrav = &(hVObject->pETRLEObject[usImageIndex]);
|
||||
sXPos += pTrav->sOffsetX;
|
||||
sYPos += pTrav->sOffsetY;
|
||||
pTrav = &(hVObject->pETRLEObject[usImageIndex]);
|
||||
sXPos += pTrav->sOffsetX;
|
||||
sYPos += pTrav->sOffsetY;
|
||||
|
||||
if (gfUIDisplayActionPointsInvalid)
|
||||
if (gfUIDisplayActionPointsInvalid)
|
||||
{
|
||||
SetFontBackground(FONT_MCOLOR_BLACK);
|
||||
SetFontForeground(FONT_MCOLOR_WHITE);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetFontBackground(FONT_MCOLOR_BLACK);
|
||||
SetFontForeground(FONT_MCOLOR_WHITE);
|
||||
}
|
||||
|
||||
if (gfUIDisplayActionPointsBlack)
|
||||
{
|
||||
SetFontBackground(FONT_MCOLOR_BLACK);
|
||||
SetFontForeground(FONT_MCOLOR_BLACK);
|
||||
}
|
||||
|
||||
SetFont(TINYFONT1);
|
||||
SetFontDestBuffer(guiSAVEBUFFER, 0, gsVIEWPORT_WINDOW_START_Y, SCREEN_WIDTH, gsVIEWPORT_WINDOW_END_Y, FALSE);
|
||||
VarFindFontCenterCoordinates(sXPos, sYPos, 1, 1, TINYFONT1, &sX, &sY, L"%d", pNode->uiAPCost);
|
||||
mprintf_buffer(pDestBuf, uiDestPitchBYTES, TINYFONT1, sX, sY, L"%d", pNode->uiAPCost);
|
||||
SetFontDestBuffer(FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE);
|
||||
}
|
||||
else if ((uiLevelNodeFlags & LEVELNODE_ERASEZ) && !(uiFlags & TILES_DIRTY))
|
||||
{
|
||||
Zero8BPPDataTo16BPPBufferTransparent((UINT16*)pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex);
|
||||
//Zero8BPPDataTo16BPPBufferTransparent( (UINT16*)gpZBuffer, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex );
|
||||
}
|
||||
else if ((uiLevelNodeFlags & LEVELNODE_ITEM) && !(uiFlags & TILES_DIRTY))
|
||||
{
|
||||
BOOLEAN bItemOutline = TRUE;
|
||||
|
||||
UINT16 usOutlineColor = gusNormalItemOutlineColor;
|
||||
if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF)
|
||||
{
|
||||
usOutlineColor = gusYellowItemOutlineColor;
|
||||
}
|
||||
|
||||
if (gGameSettings.fOptions[TOPTION_GLOW_ITEMS])
|
||||
{
|
||||
if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF)
|
||||
{
|
||||
SetFontBackground(FONT_MCOLOR_BLACK);
|
||||
SetFontForeground(FONT_MCOLOR_WHITE);
|
||||
usOutlineColor = us16BPPItemCycleYellowColors[gsCurrentItemGlowFrame];
|
||||
}
|
||||
else
|
||||
{
|
||||
SetFontBackground(FONT_MCOLOR_BLACK);
|
||||
SetFontForeground(FONT_MCOLOR_WHITE);
|
||||
}
|
||||
|
||||
if (gfUIDisplayActionPointsBlack)
|
||||
{
|
||||
SetFontBackground(FONT_MCOLOR_BLACK);
|
||||
SetFontForeground(FONT_MCOLOR_BLACK);
|
||||
}
|
||||
|
||||
SetFont(TINYFONT1);
|
||||
SetFontDestBuffer(guiSAVEBUFFER, 0, gsVIEWPORT_WINDOW_START_Y, SCREEN_WIDTH, gsVIEWPORT_WINDOW_END_Y, FALSE);
|
||||
VarFindFontCenterCoordinates(sXPos, sYPos, 1, 1, TINYFONT1, &sX, &sY, L"%d", pNode->uiAPCost);
|
||||
mprintf_buffer(pDestBuf, uiDestPitchBYTES, TINYFONT1, sX, sY, L"%d", pNode->uiAPCost);
|
||||
SetFontDestBuffer(FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE);
|
||||
}
|
||||
else if ( uiLevelNodeFlags & LEVELNODE_ERASEZ )
|
||||
{
|
||||
Zero8BPPDataTo16BPPBufferTransparent((UINT16*)pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex);
|
||||
//Zero8BPPDataTo16BPPBufferTransparent( (UINT16*)gpZBuffer, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex );
|
||||
}
|
||||
else if ( uiLevelNodeFlags & LEVELNODE_ITEM )
|
||||
{
|
||||
BOOLEAN bItemOutline = TRUE;
|
||||
|
||||
UINT16 usOutlineColor = gusNormalItemOutlineColor;
|
||||
if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF)
|
||||
{
|
||||
usOutlineColor = gusYellowItemOutlineColor;
|
||||
}
|
||||
|
||||
if (gGameSettings.fOptions[TOPTION_GLOW_ITEMS])
|
||||
{
|
||||
if (uiRowFlags == TILES_STATIC_ONROOF || uiRowFlags == TILES_DYNAMIC_ONROOF)
|
||||
if (gTacticalStatus.uiFlags & RED_ITEM_GLOW_ON)
|
||||
{
|
||||
usOutlineColor = us16BPPItemCycleYellowColors[gsCurrentItemGlowFrame];
|
||||
usOutlineColor = us16BPPItemCycleRedColors[gsCurrentItemGlowFrame];
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gTacticalStatus.uiFlags & RED_ITEM_GLOW_ON)
|
||||
{
|
||||
usOutlineColor = us16BPPItemCycleRedColors[gsCurrentItemGlowFrame];
|
||||
}
|
||||
else
|
||||
{
|
||||
usOutlineColor = us16BPPItemCycleWhiteColors[gsCurrentItemGlowFrame];
|
||||
}
|
||||
usOutlineColor = us16BPPItemCycleWhiteColors[gsCurrentItemGlowFrame];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
|
||||
bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
|
||||
if (bBlitClipVal == FALSE)
|
||||
{
|
||||
if (fObscuredBlitter)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
|
||||
}
|
||||
else
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZ((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
|
||||
}
|
||||
}
|
||||
else if (bBlitClipVal == TRUE)
|
||||
{
|
||||
if (fObscuredBlitter)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZPixelateObscuredClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
|
||||
}
|
||||
else
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
|
||||
}
|
||||
}
|
||||
}
|
||||
// ATE: Check here for a lot of conditions!
|
||||
else if ((uiLevelNodeFlags & LEVELNODE_PHYSICSOBJECT) && !(uiFlags & TILES_DIRTY))
|
||||
{
|
||||
|
||||
bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
|
||||
|
||||
if (fShadowBlitter)
|
||||
{
|
||||
if (bBlitClipVal == FALSE)
|
||||
{
|
||||
if (fObscuredBlitter)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZPixelateObscured((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
|
||||
}
|
||||
else
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZ((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
|
||||
}
|
||||
Blt8BPPDataTo16BPPBufferShadowZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferShadowZNBClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
BOOLEAN bItemOutline = FALSE;
|
||||
UINT16 usOutlineColor = 0; // Not used as bItemOutline == false but needs to be fed to the function calls
|
||||
|
||||
if (bBlitClipVal == FALSE)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
|
||||
}
|
||||
else if (bBlitClipVal == TRUE)
|
||||
{
|
||||
if (fObscuredBlitter)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZPixelateObscuredClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
|
||||
}
|
||||
else
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ( uiLevelNodeFlags & LEVELNODE_PHYSICSOBJECT )
|
||||
{
|
||||
|
||||
bBlitClipVal = BltIsClippedOrOffScreen(hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
|
||||
|
||||
if (fShadowBlitter)
|
||||
{
|
||||
if (bBlitClipVal == FALSE)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferShadowZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferShadowZNBClip((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, &gClippingRect);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
BOOLEAN bItemOutline = FALSE;
|
||||
UINT16 usOutlineColor = 0; // Not used as bItemOutline == false but needs to be fed to the function calls
|
||||
|
||||
if (bBlitClipVal == FALSE)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineZNB((UINT16*)pDestBuf, uiDestPitchBYTES, gpZBuffer, sZLevel, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline);
|
||||
}
|
||||
else if (bBlitClipVal == TRUE)
|
||||
{
|
||||
Blt8BPPDataTo16BPPBufferOutlineClip((UINT16*)pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
|
||||
}
|
||||
Blt8BPPDataTo16BPPBufferOutlineClip((UINT16*)pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex, usOutlineColor, bItemOutline, &gClippingRect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user