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

- F7 screen now shows the nova sun for systems destroyed by novae, planets everywhere else.

Browse Source 
- moving from screen to screen now always resets the background image.
- fixed xcode compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2494 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2009-09-13 14:51:21 +00:00
parent ccfce445a3
commit fabfc9b391
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Oolite.xcodeproj/project.pbxproj
View File

@ -660,6 +660,9 @@
25F46752099695D5009483BF /* OoliteApp.h in Headers */ = {isa = PBXBuildFile; fileRef = 25F46750099695D5009483BF /* OoliteApp.h */; };
25F46753099695D5009483BF /* OoliteApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 25F46751099695D5009483BF /* OoliteApp.m */; };
25F4676509969672009483BF /* MyOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 25F4676309969672009483BF /* MyOpenGLView.m */; };
2B13C51F105D342D00AF4A7B /* oolite-nova-system.png in Copy Debug OXP */ = {isa = PBXBuildFile; fileRef = 2B13C51E105D342D00AF4A7B /* oolite-nova-system.png */; };
2B13C520105D342D00AF4A7B /* oolite-nova-system.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B13C51E105D342D00AF4A7B /* oolite-nova-system.png */; };
2B13C521105D343900AF4A7B /* oolite-nova-system.png in Copy Images */ = {isa = PBXBuildFile; fileRef = 2B13C51E105D342D00AF4A7B /* oolite-nova-system.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -728,6 +731,7 @@
dstPath = Images;
dstSubfolderSpec = 7;
files = (
2B13C521105D343900AF4A7B /* oolite-nova-system.png in Copy Images */,
1A2315520B9C778400EF0852 /* solar.png in Copy Images */,
1A2315550B9C778400EF0852 /* trumblebox.png in Copy Images */,
);
@ -1063,6 +1067,7 @@
dstSubfolderSpec = 16;
files = (
1AD267650C83058C00B4BFD1 /* Debug.oxp in Copy Debug OXP */,
2B13C51F105D342D00AF4A7B /* oolite-nova-system.png in Copy Debug OXP */,
);
name = "Copy Debug OXP";
runOnlyForDeploymentPostprocessing = 0;
@ -1745,6 +1750,7 @@
29B97319FDCFA39411CA2CEA /* MainMenu.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MainMenu.nib; path = ../src/Cocoa/MainMenu.nib; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
2B13C51E105D342D00AF4A7B /* oolite-nova-system.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "oolite-nova-system.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -1842,6 +1848,7 @@
1A23154D0B9C778400EF0852 /* Images */ = {
isa = PBXGroup;
children = (
2B13C51E105D342D00AF4A7B /* oolite-nova-system.png */,
1A23154E0B9C778400EF0852 /* solar.png */,
1A23154F0B9C778400EF0852 /* splash.png */,
1A2315500B9C778400EF0852 /* splashback.png */,
@ -3188,6 +3195,7 @@
1ABFEE2210507987005AA752 /* oolite-nonshared.xcconfig in Resources */,
1A2123271051892500530CDE /* shipdata-overrides.plist in Resources */,
1A2123291051892D00530CDE /* slow-gpus.plist in Resources */,
2B13C520105D342D00AF4A7B /* oolite-nova-system.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
src/Cocoa/OOCASound.m
View File

@ -340,7 +340,7 @@ void OOCASoundVerifyBuffers(AudioBufferList *buffers, OOUInteger numFrames, OOSo
{
BOOL allOK = YES;
UInt32 i;
float badVal;
float badVal = 0.0;
for (i = 0; i < buffers->mNumberBuffers; i++)
{

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

@ -4567,19 +4567,16 @@ static PlayerEntity *sSharedPlayer = nil;
}
[gui clear];
[UNIVERSE removeDemoShips];
[gui setTitle:[NSString stringWithFormat:DESC(@"sysdata-planet-name-@"), targetSystemName]];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-eco"), economy_desc, nil] forRow:1];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-eco"), economy_desc, nil] forRow:1];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-govt"), government_desc, nil] forRow:3];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-tl"), [NSString stringWithFormat:@"%d", techlevel + 1], nil] forRow:5];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-pop"), [NSString stringWithFormat:@"%.1f %@", 0.1*population, DESC(@"sysdata-billion-word")], nil] forRow:7];
[gui setArray:[NSArray arrayWithObjects:@"", [NSString stringWithFormat:@"(%@)", inhabitants], nil] forRow:8];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-prod"), @"", [NSString stringWithFormat:DESC(@"sysdata-prod-worth"), productivity], nil] forRow:10];
[gui setArray:[NSArray arrayWithObjects:DESC(@"sysdata-radius"), @"", [NSString stringWithFormat:@"%5d km", radius], nil] forRow:12];
int i = [gui addLongText:system_desc startingAtRow:15 align:GUI_ALIGN_LEFT];
@ -4605,14 +4602,12 @@ static PlayerEntity *sSharedPlayer = nil;
[UNIVERSE setDisplayText: YES];
[UNIVERSE setDisplayCursor: NO];
[UNIVERSE setViewDirection: VIEW_GUI_DISPLAY];
[UNIVERSE removeDemoShips];
// if the system has gone nova, display the sun instead of the planet
if (sunGoneNova)
{
// FIXME: commented out until gui clearBackground is fixed.
//[[UNIVERSE gui] setBackgroundTexture:[OOTexture textureWithName:@"solar.png" inFolder:@"Images"]];
[[UNIVERSE gui] setBackgroundTexture:[[OOTexture textureWithName:@"oolite-nova-system.png" inFolder:@"Images"] retain]];
}
else
{

3
src/Core/GuiDisplayGen.m
View File

@ -505,6 +505,7 @@ OOINLINE BOOL RowInRange(OOGUIRow row, NSRange range)
}
[self setShowTextCursor:NO];
[self setSelectableRange:NSMakeRange(0,0)];
[self clearBackground];
}
@ -955,7 +956,7 @@ OOINLINE BOOL RowInRange(OOGUIRow row, NSRange range)
// show background image...
//
if (backgroundSprite)
if (backgroundSprite!=nil)
{
[backgroundSprite blitCentredToX:x + 0.5f * size_in_pixels.width Y:y + 0.5f * size_in_pixels.height Z:z alpha:alpha];
}