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

All clock adjustments are now additive (Bug #17969).

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4504 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2011-04-02 10:03:39 +00:00
parent 2d72212f21
commit 5ce16b9d74
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4666,7 +4666,7 @@ static bool minShieldLevelPercentageInitialised = false;
[[OOMusicController sharedController] stop];
ship_clock_adjust = 600.0; // 10 minutes to leave dock
ship_clock_adjust += 600.0; // 10 minutes to leave dock
[station launchShip:self];
@ -5001,7 +5001,7 @@ static bool minShieldLevelPercentageInitialised = false;
// set clock after "playerWillEnterWitchspace" and before removeAllEntitiesExceptPlayer, to allow escorts time to follow their mother.
double distance = distanceBetweenPlanetPositions(sTo.d,sTo.b,galaxy_coordinates.x,galaxy_coordinates.y);
ship_clock_adjust = distance * distance * (misjump ? 2700.0 : 3600.0); // LY * LY hrs - misjumps take 3/4 time of the full jump, they're not the same as a jump of half the length!
ship_clock_adjust += distance * distance * (misjump ? 2700.0 : 3600.0); // LY * LY hrs - misjumps take 3/4 time of the full jump, they're not the same as a jump of half the length!
[UNIVERSE removeAllEntitiesExceptPlayer];
@ -7452,7 +7452,7 @@ static NSString *last_outfitting_key=nil;
// one of the fined-@-credits strings includes expansion tokens
NSString* fined_message = [NSString stringWithFormat:ExpandDescriptionForCurrentSystem(DESC(@"fined-@-credits")), OOCredits(fine)];
[self addMessageToReport:fined_message];
ship_clock_adjust = 24 * 3600; // take up a day
ship_clock_adjust += 24 * 3600; // take up a day
}

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

@ -3414,7 +3414,7 @@ static BOOL toggling_music;
}
[self setDockingClearanceStatus:DOCKING_CLEARANCE_STATUS_GRANTED];
ship_clock_adjust = 1200.0; // 20 minutes penalty to enter dock
ship_clock_adjust += 1200.0; // 20 minutes penalty to enter dock
ident_engaged = NO;
[self safeAllMissiles];
[UNIVERSE setViewDirection:VIEW_FORWARD];