Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not draw repair and baba muzzle flashes if structure is not seen by current player. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8868 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2009-12-30 13:18:24 +00:00 committed by Git SVN Gateway
parent 9e817f6537
commit 1f40cec1e3
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/display3d.c
View File

@ -2294,7 +2294,7 @@ void renderStructure(STRUCTURE *psStructure)
pie_TRANSLATE(0, 0, psStructure->asWeaps[i].recoilValue);
pie_Draw3DShape(weaponImd[i], playerFrame, 0, buildingBrightness, WZCOL_BLACK, pieFlag, pieFlagData);
if (psStructure->status == SS_BUILT)
if (psStructure->status == SS_BUILT && psStructure->visible[selectedPlayer] > (UBYTE_MAX / 2))
{
if (psStructure->pStructureType->type == REF_REPAIR_FACILITY)
{
@ -2327,8 +2327,7 @@ void renderStructure(STRUCTURE *psStructure)
}
}
// we have a weapon so we draw a muzzle flash
if( weaponImd[i]->nconnectors && flashImd[i] && psStructure->visible[selectedPlayer]>(UBYTE_MAX/2)
&& psStructure->pStructureType->type != REF_REPAIR_FACILITY)
if( weaponImd[i]->nconnectors && flashImd[i] && psStructure->pStructureType->type != REF_REPAIR_FACILITY)
{
unsigned int connector_num = 0;
@ -2394,23 +2393,26 @@ void renderStructure(STRUCTURE *psStructure)
iV_TRANSLATE(0, 0, -40);
}
iV_MatrixRotateX(DEG(psStructure->asWeaps[i].pitch));
// and draw the muzzle flash
// animate for the duration of the flash only
// assume no clan colours formuzzle effects
if (flashImd[i]->numFrames == 0 || flashImd[i]->animInterval <= 0)
// draw the muzzle flash?
if (psStructure && psStructure->visible[selectedPlayer] > UBYTE_MAX / 2)
{
// no anim so display one frame for a fixed time
if (gameTime < psStructure->asWeaps[i].lastFired + BASE_MUZZLE_FLASH_DURATION)
// animate for the duration of the flash only
// assume no clan colours for muzzle effects
if (flashImd[i]->numFrames == 0 || flashImd[i]->animInterval <= 0)
{
pie_Draw3DShape(flashImd[i], 0, 0, buildingBrightness, WZCOL_BLACK, 0, 0); //muzzle flash
// no anim so display one frame for a fixed time
if (gameTime < psStructure->asWeaps[i].lastFired + BASE_MUZZLE_FLASH_DURATION)
{
pie_Draw3DShape(flashImd[i], 0, 0, buildingBrightness, WZCOL_BLACK, 0, 0); //muzzle flash
}
}
}
else
{
frame = (gameTime - psStructure->asWeaps[i].lastFired) / flashImd[i]->animInterval;
if (frame < flashImd[i]->numFrames)
else
{
pie_Draw3DShape(flashImd[i], 0, 0, buildingBrightness, WZCOL_BLACK, 0, 0); //muzzle flash
frame = (gameTime - psStructure->asWeaps[i].lastFired) / flashImd[i]->animInterval;
if (frame < flashImd[i]->numFrames)
{
pie_Draw3DShape(flashImd[i], 0, 0, buildingBrightness, WZCOL_BLACK, 0, 0); //muzzle flash
}
}
}
iV_MatrixEnd();