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

Fix error in parcels scripts.

Browse Source 
Document "interfaces" entry in screenbackgrounds.plist


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5426 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Chris Morris 2012-10-12 19:13:39 +00:00
parent e65ec2f154
commit 7ecd1f84bf
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/screenbackgrounds.plist
View File

@ -17,6 +17,8 @@
equip_ship = "equip-ship.png";
mount_weapon = "mount-weapon.png"; // if not defined, same as equip_ship
shipyard = "shipyard.png";
interfaces = "interfaces.png";
long_range_chart1 = "long-range-chart1.png"; // if not defined, same as long_range_chart
long_range_chart2 = "long-range-chart2.png"; // if not defined, same as long_range_chart

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

@ -50,6 +50,9 @@ this.$parcelSummaryPageBackground = "";
this.startUp = function()
{
this.$suspendedDestination = null;
this.$suspendedHUD = false;
// stored contents of local main station's parcel contract list
if (missionVariables.oolite_contracts_parcels)
{
@ -86,7 +89,7 @@ this.playerWillSaveGame = function()
// system and HUD settings, which the mission screens may have
// affected.
this.guiScreenChanged = this.shipWillLaunchFromStation = function() {
if (this.$suspendedHUD)
if (this.$suspendedHUD !== false)
{
player.ship.hudHidden = false;
this.$suspendedHUD = false;

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

@ -7078,7 +7078,6 @@ static NSString *last_outfitting_key=nil;
{
[gui setForegroundTextureKey:@"docked_overlay"];
NSDictionary *background = [UNIVERSE screenTextureDescriptorForKey:@"interfaces"];
[self setEquipScreenBackgroundDescriptor:background];
[gui setBackgroundTextureDescriptor:background];
}
}