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

Fix potential crash with interfaces.

Browse Source 
Remove "far too late" parcel contracts from the list.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5329 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Chris Morris 2012-09-15 20:18:56 +00:00
parent 1a576b24b3
commit 40c975ffcb
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Resources/Scripts/oolite-contracts-parcels.js
View File

@ -218,6 +218,8 @@ this._parcelContractsScreens = function(interfaceKey)
// the interfaceKey parameter is not used here, but would be useful if
// this callback managed more than one interface entry
this._validateParcels();
// set up variables used to remember state on the mission screens
this.$suspendedDestination = null;
this.$suspendedHUD = false;
@ -237,8 +239,12 @@ this._parcelContractsScreens = function(interfaceKey)
// to select the appropriate mission screen and display it
this._parcelContractsDisplay = function(summary) {
// if there are no parcels (because the player has taken the last one)
// display a message and quit.
// Again. Has to be done on every call to this function, but also
// has to be done at the start.
this._validateParcels();
// if there are no parcels (usually because the player has taken
// the last one) display a message and quit.
if (this.$parcels.length === 0)
{
mission.runScreen({titleKey: "oolite-contracts-parcels-none-available-title",
@ -549,6 +555,32 @@ this._acceptContract = function()
}
// removes any expired parcels
this._validateParcels = function()
{
var c = this.$parcels.length-1;
var removed = false;
// iterate downwards so we can safely remove as we go
for (var i=c;i>=0;i--)
{
// if the time remaining is less than 1/3 of the estimated
// delivery time, even in the best case it's probably not
// going to get there.
if (this._timeRemainingSeconds(this.$parcels[i]) < this._timeEstimateSeconds(this.$parcels[i]) / 3)
{
// remove it
this.$parcels.splice(i,1);
removed = true;
}
}
if (removed)
{
// update the interface description if we removed any
this._updateMainStationInterfacesList();
}
}
/* Utility functions */
@ -614,4 +646,6 @@ this._formatTravelTime = function(seconds) {
// lower-cases the initial letter of the package contents
this._formatPackageName = function(name) {
return name.charAt(0).toLowerCase() + name.slice(1);
}
}

8
src/Core/Scripting/OOJSInterfaceDefinition.m
View File

@ -148,7 +148,8 @@ MA 02110-1301, USA.
jsval cKey = OOJSValueFromNativeObject(context, key);
[OOJSScript pushScript:_owningScript];
OOJSScript *owner = [_owningScript retain]; // local copy needed
[OOJSScript pushScript:owner];
[engine callJSFunction:_callback
forObject:_callbackThis
@ -156,8 +157,9 @@ MA 02110-1301, USA.
argv:&cKey
result:&rval];
[OOJSScript popScript:_owningScript];
[OOJSScript popScript:owner];
[owner release];
OOJSRelinquishContext(context);
}