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

Return values and semicolons for all!

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2890 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-12-17 07:33:10 +00:00
parent 7c2a544db2
commit ca8bdfa70e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Config/shipdata.plist
View File

@ -825,7 +825,7 @@
frequency = 0.15; frequency = 0.15;
phase = -1; phase = -1;
size = 150; size = 150;
colors = ({hue = 60;},{ hue = 30;},{ hue = 30; saturation = 0; brightness = 0.85}); colors = ({ hue = 60; }, { hue = 30; }, { hue = 30; saturation = 0; brightness = 0.85; });
}, },
{ {
type = "flasher"; type = "flasher";
@ -833,7 +833,7 @@
frequency = 0.15; frequency = 0.15;
phase = 1; phase = 1;
size = 150; size = 150;
colors = ({ hue = 30; saturation = 0; brightness = 0.85},{ hue = 60;},{hue = 30;}); colors = ({ hue = 30; saturation = 0; brightness = 0.85; }, { hue = 60; }, { hue = 30; });
}, },
/* Old flashers. Replaced by the multicolour ones above. /* Old flashers. Replaced by the multicolour ones above.
"*FLASHER* 0 0 60 60 0.15 1 150", "*FLASHER* 0 0 60 60 0.15 1 150",

2
src/Core/Entities/ShipEntity.m
View File

@ -7426,7 +7426,7 @@ BOOL class_masslocks(int some_class)
- (OOUniversalID)launchEscapeCapsule - (OOUniversalID)launchEscapeCapsule
{ {
OOUniversalID result = NO_TARGET; OOUniversalID result = NO_TARGET;
ShipEntity *mainPod = nil, *pod = nil; ShipEntity *mainPod = nil;
unsigned n_pods, i; unsigned n_pods, i;
/* BUG: player can't launch escape pod in interstellar space (because /* BUG: player can't launch escape pod in interstellar space (because

8
src/Core/Universe.m
View File

@ -2570,23 +2570,23 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
{ {
point0 = [self getWitchspaceExitPosition]; point0 = [self getWitchspaceExitPosition];
entity = [self planet]; entity = [self planet];
if (!entity) return; if (entity == nil) return nil;
} }
else if ([route isEqualTo:@"ws"] || [route isEqualTo:@"sw"]) else if ([route isEqualTo:@"ws"] || [route isEqualTo:@"sw"])
{ {
point0 = [self getWitchspaceExitPosition]; point0 = [self getWitchspaceExitPosition];
entity = [self sun]; entity = [self sun];
if (!entity) return; if (entity == nil) return nil;
} }
else if ([route isEqualTo:@"sp"] || [route isEqualTo:@"ps"]) else if ([route isEqualTo:@"sp"] || [route isEqualTo:@"ps"])
{ {
entity = [self sun]; entity = [self sun];
if (!entity) return; if (entity == nil) return nil;
point0 = [entity position]; point0 = [entity position];
double radius0 = [entity radius]; double radius0 = [entity radius];
entity = [self planet]; entity = [self planet];
if (!entity) return; if (entity == nil) return nil;
point1 = [entity position]; point1 = [entity position];
// shorten the route by scanner range & sun radius, otherwise ships could be created inside it. // shorten the route by scanner range & sun radius, otherwise ships could be created inside it.