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

src/display3d.c: Fix a bit of component.c-style code duplication. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9318 4a71c877-e1ca-e34f-864e-861f7616d084
master
Cyp 2010-01-18 09:57:43 +00:00 committed by Git SVN Gateway
parent 3f8d7f9247
commit 453ec09121
1 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/display3d.c
View File

@ -2197,53 +2197,34 @@ void renderStructure(STRUCTURE *psStructure)
}
//get an imd to draw on the connector priority is weapon, ECM, sensor
//check for weapon
if (psStructure->numWeaps > 0)
for (i = 0; i < MAX(1, psStructure->numWeaps); i++)
{
for (i = 0; i < psStructure->numWeaps; i++)
if (psStructure->asWeaps[i].nStat > 0)
{
if (psStructure->asWeaps[i].nStat > 0)
{
nWeaponStat = psStructure->asWeaps[i].nStat;
weaponImd[i] = asWeaponStats[nWeaponStat].pIMD;
mountImd[i] = asWeaponStats[nWeaponStat].pMountGraphic;
flashImd[i] = asWeaponStats[nWeaponStat].pMuzzleGraphic;
}
}
}
else
{
if (psStructure->asWeaps[0].nStat > 0)
{
nWeaponStat = psStructure->asWeaps[0].nStat;
weaponImd[0] = asWeaponStats[nWeaponStat].pIMD;
mountImd[0] = asWeaponStats[nWeaponStat].pMountGraphic;
flashImd[0] = asWeaponStats[nWeaponStat].pMuzzleGraphic;
nWeaponStat = psStructure->asWeaps[i].nStat;
weaponImd[i] = asWeaponStats[nWeaponStat].pIMD;
mountImd[i] = asWeaponStats[nWeaponStat].pMountGraphic;
flashImd[i] = asWeaponStats[nWeaponStat].pMuzzleGraphic;
}
}
if (weaponImd[0] == NULL)
// check for ECM
if (weaponImd[0] == NULL && psStructure->pStructureType->pECM != NULL)
{
//check for ECM
if (psStructure->pStructureType->pECM != NULL)
{
weaponImd[0] = psStructure->pStructureType->pECM->pIMD;
mountImd[0] = psStructure->pStructureType->pECM->pMountGraphic;
flashImd[0] = NULL;
}
weaponImd[0] = psStructure->pStructureType->pECM->pIMD;
mountImd[0] = psStructure->pStructureType->pECM->pMountGraphic;
flashImd[0] = NULL;
}
if (weaponImd[0] == NULL) // not set above
// check for sensor (or repair center)
if (weaponImd[0] == NULL && psStructure->pStructureType->pSensor != NULL)
{
//check for sensor (or repair center)
if (psStructure->pStructureType->pSensor != NULL)
{
weaponImd[0] = psStructure->pStructureType->pSensor->pIMD;
/* No recoil for sensors */
psStructure->asWeaps[0].recoilValue = 0;
mountImd[0] = psStructure->pStructureType->pSensor->pMountGraphic;
flashImd[0] = NULL;
}
weaponImd[0] = psStructure->pStructureType->pSensor->pIMD;
/* No recoil for sensors */
psStructure->asWeaps[0].recoilValue = 0;
mountImd[0] = psStructure->pStructureType->pSensor->pMountGraphic;
flashImd[0] = NULL;
}
// flags for drawing weapons
if (structureIsBlueprint(psStructure))
{