Bugfixes (by Flugente)

- added a flag that drastically lowers the time needed for drug evaluations
- FIX: fixed a but that could lead to iron sights be used although they were forbidden
- FIX: scopes/sights are also selectable if they do not have a magnification factor (1.0 is used)
- FIX: sector cooldown to zero didn't work as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-07-09 08:50:26 +00:00
parent 66a2a41f7d
commit 5c3115d743
7 changed files with 82 additions and 18 deletions
+2 -2
View File
@@ -847,7 +847,7 @@ void CoolDownWorldItems( BOOLEAN fSetZero )
{
FLOAT newguntemperature = 0.0f;
if ( !fSetZero && gGameExternalOptions.fSetZeroUponNewSector )
if ( !fSetZero || !gGameExternalOptions.fSetZeroUponNewSector )
{
FLOAT guntemperature = (*pObj)[i]->data.bTemperature; // ... get temperature ...
@@ -873,7 +873,7 @@ void CoolDownWorldItems( BOOLEAN fSetZero )
{
FLOAT newtemperature = 0.0f;
if ( !fSetZero && gGameExternalOptions.fSetZeroUponNewSector )
if ( !fSetZero || !gGameExternalOptions.fSetZeroUponNewSector )
{
FLOAT temperature = (*iter)[i]->data.bTemperature; // ... get temperature of item ...