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

Fix bad rotation time for weapon turrets introduced by me in r3282. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3355 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-01-05 15:15:57 +00:00
parent ae19f5bd54
commit 3f996d8a85
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/action.c
View File

@ -362,23 +362,22 @@ BOOL actionTargetTurret(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, UWORD *p
float fR;
SDWORD pitchLowerLimit, pitchUpperLimit;
DROID *psDroid = NULL;
// Vector3i muzzle;
//these are constants now and can be set up at the start of the function
rotRate = ACTION_TURRET_ROTATION_RATE;
pitchRate = (SWORD)(ACTION_TURRET_ROTATION_RATE/2);
// these are constants now and can be set up at the start of the function
rotRate = ACTION_TURRET_ROTATION_RATE * 4;
pitchRate = ACTION_TURRET_ROTATION_RATE * 2;
//added for 22/07/99 upgrade - AB
if (psWeapStats)
{
//extra heavy weapons on some structures need to rotate and pitch more slowly
if (psWeapStats->weight > HEAVY_WEAPON_WEIGHT)
{
rotRate = (SWORD)(ACTION_TURRET_ROTATION_RATE/2 - (100 *
(psWeapStats->weight - HEAVY_WEAPON_WEIGHT) / psWeapStats->weight));
pitchRate = (SWORD) (rotRate / 2);
}
}
if (psWeapStats)
{
// extra heavy weapons on some structures need to rotate and pitch more slowly
if (psWeapStats->weight > HEAVY_WEAPON_WEIGHT)
{
UDWORD excess = 100 * (psWeapStats->weight - HEAVY_WEAPON_WEIGHT) / psWeapStats->weight;
rotRate = ACTION_TURRET_ROTATION_RATE * 2 - excess;
pitchRate = (SWORD) (rotRate / 2);
}
}
tRotation = *pRotation;
tPitch = *pPitch;