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

Made awardFuel and setFuelLeak act on the appropriate script target entity rather than always on the player.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1185 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2007-09-27 06:03:34 +00:00
parent 8b098b3b76
commit 53a0d0c1c0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/Entities/PlayerEntityLegacyScriptEngine.m
View File

@ -905,6 +905,8 @@ static int scriptRandomSeed = -1; // ensure proper random function
- (void) commsMessage:(NSString *)valueString
{
if (script_target != self) return;
Random_Seed very_random_seed;
very_random_seed.a = rand() & 255;
very_random_seed.b = rand() & 255;
@ -1160,11 +1162,13 @@ static int scriptRandomSeed = -1; // ensure proper random function
- (void) awardFuel:(NSString *)valueString // add to fuel up to 7.0 LY
{
int delta = 10 * [valueString floatValue];
if (delta < 0 && fuel < (unsigned)-delta) fuel = 0;
OOFuelQuantity scriptTargetFuelBeforeAward = [script_target fuel];
if (delta < 0 && scriptTargetFuelBeforeAward < (unsigned)-delta) [script_target setFuel:0];
else
{
fuel += delta;
if (fuel > PLAYER_MAX_FUEL) fuel = PLAYER_MAX_FUEL;
[script_target setFuel:(scriptTargetFuelBeforeAward + delta)];
if ([script_target fuel] > PLAYER_MAX_FUEL) [script_target setFuel:PLAYER_MAX_FUEL];
}
}
@ -1816,7 +1820,13 @@ static int scriptRandomSeed = -1; // ensure proper random function
- (void) setFuelLeak: (NSString *)value
{
{
if (script_target != self)
{
[script_target setFuel:0];
return;
}
fuel_leak_rate = [value doubleValue];
if (fuel_leak_rate > 0)
{