Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug #17995

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4462 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Michael Werle 2011-03-11 22:36:53 +00:00
parent b5d27a87e7
commit e4089d38f8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/CHANGELOG.TXT
View File

@ -14,7 +14,7 @@ Changes between Oolite 1.75 and Oolite 1.75.1:
and with ships with escorts.
* Interim fix for mass-dependent fuel prices not working. (Bug #17947)
* Various bug fixes and cosmetic tweaks, including but not limited to bugs
#17944, #17968, #17975, #17992, and #17993.
#17944, #17968, #17975, #17992, #17993, and #17995.
JavaScript:
* JavaScript Ship equipmentStatus() now works for primary and secondary weapons.

7
src/Core/Entities/PlayerEntity.m
View File

@ -2600,7 +2600,12 @@ static bool minShieldLevelPercentageInitialised = false;
OOLog(kOOLogInconsistentState, @"Internal Error - WH_SCANINFO_NONE reached in [PlayerEntity updateTargeting:]");
[self dumpState];
[wh dumpState];
assert([wh scanInfo] != WH_SCANINFO_NONE);
// Workaround a reported hit of the assert here. We really
// should work out how/why this could happen though and fix
// the underlying cause.
// - MKW 2011.03.11
//assert([wh scanInfo] != WH_SCANINFO_NONE);
[wh setScannedAt:[self clockTimeAdjusted]];
break;
case WH_SCANINFO_SCANNED:
if ([self clockTimeAdjusted] > [wh scanTime] + 2)