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

Added the ship dictionary key hyperspace_motor_spin_time, which allows variable lengths of hyperspace and/or intergalactic jump countdowns. Defaults to 15.0 seconds.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1697 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2008-07-19 14:03:05 +00:00
parent 4d7443c17c
commit 8f745e8978
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,6 +950,8 @@ static PlayerEntity *sSharedPlayer = nil;
thrust = [shipDict floatForKey:@"thrust" defaultValue:thrust];
hyperspaceMotorSpinTime = [shipDict doubleForKey:@"hyperspace_motor_spin_time" defaultValue:15.0];
maxEnergy = [shipDict floatForKey:@"max_energy" defaultValue:maxEnergy];
energy_recharge_rate = [shipDict floatForKey:@"energy_recharge_rate" defaultValue:energy_recharge_rate];
energy = maxEnergy;

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

@ -964,7 +964,7 @@ static NSTimeInterval time_last_frame;
if (jumpOK)
{
galactic_witchjump = NO;
witchspaceCountdown = 15.0;
witchspaceCountdown = hyperspaceMotorSpinTime;
status = STATUS_WITCHSPACE_COUNTDOWN;
[self playStandardHyperspace];
// say it!
@ -1004,7 +1004,7 @@ static NSTimeInterval time_last_frame;
if (jumpOK)
{
galactic_witchjump = YES;
witchspaceCountdown = 15.0;
witchspaceCountdown = hyperspaceMotorSpinTime;
status = STATUS_WITCHSPACE_COUNTDOWN;
[self playGalacticHyperspace];
// say it!

1
src/Core/Entities/ShipEntity.h
View File

@ -130,6 +130,7 @@ MA 02110-1301, USA.
GLfloat max_flight_yaw;
GLfloat thrust; // acceleration
double hyperspaceMotorSpinTime; // duration of hyperspace countdown
// TODO: stick all equipment in a list, and move list from playerEntity to shipEntity. -- Ahruman
unsigned military_jammer_active: 1, // military_jammer

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

@ -294,6 +294,8 @@ static NSString * const kOOLogEntityBehaviourChanged = @"entity.behaviour.change
fuel = [shipDict unsignedShortForKey:@"fuel"]; // Does it make sense that this defaults to 0? Should it not be 70? -- Ahruman
fuel_accumulator = 1.0;
hyperspaceMotorSpinTime = [shipDict doubleForKey:@"hyperspace_motor_spin_time" defaultValue:15.0];
bounty = [shipDict unsignedIntForKey:@"bounty"];
[shipAI autorelease];