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

Scripting: Makes pitch/roll/yaw for playerShip writable (#273)

Browse Source 
* Scripting: Makes pitch/roll/yaw for playerShip writable

* Fixes bounds checking issue when passing negative deltas

The increase/decrease_flight_pitch/roll/yaw methods in ShipEntity assume that deltas are always positive. The increase_ functions only check upper bounds, decrease_ functions only check lower bounds.

Now checking both upper and lower bounds in all of them, so they cope well with negative deltas.
This commit is contained in:
jobi-wan 2017-10-28 21:36:59 +02:00 committed by AnotherCommander
parent 7e555ef15b
commit 4df6613f52
2 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8627,54 +8627,60 @@ NSComparisonResult ComparePlanetsBySurfaceDistance(id i1, id i2, void* context)
- (void) increase_flight_roll:(double) delta
{
if (flightRoll < max_flight_roll)
flightRoll += delta;
if (flightRoll > max_flight_roll)
flightRoll = max_flight_roll;
else if (flightRoll < -max_flight_roll)
flightRoll = -max_flight_roll;
}
- (void) decrease_flight_roll:(double) delta
{
if (flightRoll > -max_flight_roll)
flightRoll -= delta;
if (flightRoll < -max_flight_roll)
if (flightRoll > max_flight_roll)
flightRoll = max_flight_roll;
else if (flightRoll < -max_flight_roll)
flightRoll = -max_flight_roll;
}
- (void) increase_flight_pitch:(double) delta
{
if (flightPitch < max_flight_pitch)
flightPitch += delta;
if (flightPitch > max_flight_pitch)
flightPitch = max_flight_pitch;
else if (flightPitch < -max_flight_pitch)
flightPitch = -max_flight_pitch;
}
- (void) decrease_flight_pitch:(double) delta
{
if (flightPitch > -max_flight_pitch)
flightPitch -= delta;
if (flightPitch < -max_flight_pitch)
if (flightPitch > max_flight_pitch)
flightPitch = max_flight_pitch;
else if (flightPitch < -max_flight_pitch)
flightPitch = -max_flight_pitch;
}
- (void) increase_flight_yaw:(double) delta
{
if (flightYaw < max_flight_yaw)
flightYaw += delta;
if (flightYaw > max_flight_yaw)
flightYaw = max_flight_yaw;
else if (flightYaw < -max_flight_yaw)
flightYaw = -max_flight_yaw;
}
- (void) decrease_flight_yaw:(double) delta
{
if (flightYaw > -max_flight_yaw)
flightYaw -= delta;
if (flightYaw < -max_flight_yaw)
if (flightYaw > max_flight_yaw)
flightYaw = max_flight_yaw;
else if (flightYaw < -max_flight_yaw)
flightYaw = -max_flight_yaw;
}

30
src/Core/Scripting/OOJSPlayerShip.m
View File

@ -204,7 +204,7 @@ static JSPropertySpec sPlayerShipProperties[] =
{ "multiFunctionDisplays", kPlayerShip_multiFunctionDisplays, OOJS_PROP_READONLY_CB },
{ "multiFunctionDisplayList", kPlayerShip_multiFunctionDisplayList, OOJS_PROP_READONLY_CB },
{ "price", kPlayerShip_price, OOJS_PROP_READONLY_CB },
{ "pitch", kPlayerShip_pitch, OOJS_PROP_READONLY_CB },
{ "pitch", kPlayerShip_pitch, OOJS_PROP_READWRITE_CB },
{ "primedEquipment", kPlayerShip_primedEquipment, OOJS_PROP_READWRITE_CB },
{ "renovationCost", kPlayerShip_renovationCost, OOJS_PROP_READONLY_CB },
{ "reticleColorTarget", kPlayerShip_reticleColorTarget, OOJS_PROP_READWRITE_CB },
@ -212,7 +212,7 @@ static JSPropertySpec sPlayerShipProperties[] =
{ "reticleColorWormhole", kPlayerShip_reticleColorWormhole, OOJS_PROP_READWRITE_CB },
{ "renovationMultiplier", kPlayerShip_renovationMultiplier, OOJS_PROP_READONLY_CB },
{ "reticleTargetSensitive", kPlayerShip_reticleTargetSensitive, OOJS_PROP_READWRITE_CB },
{ "roll", kPlayerShip_roll, OOJS_PROP_READONLY_CB },
{ "roll", kPlayerShip_roll, OOJS_PROP_READWRITE_CB },
{ "routeMode", kPlayerShip_routeMode, OOJS_PROP_READONLY_CB },
{ "scannerNonLinear", kPlayerShip_scannerNonLinear, OOJS_PROP_READWRITE_CB },
{ "scannerUltraZoom", kPlayerShip_scannerUltraZoom, OOJS_PROP_READWRITE_CB },
@ -229,7 +229,7 @@ static JSPropertySpec sPlayerShipProperties[] =
{ "viewPositionPort", kPlayerShip_viewPositionPort, OOJS_PROP_READONLY_CB },
{ "viewPositionStarboard", kPlayerShip_viewPositionStarboard, OOJS_PROP_READONLY_CB },
{ "weaponsOnline", kPlayerShip_weaponsOnline, OOJS_PROP_READONLY_CB },
{ "yaw", kPlayerShip_yaw, OOJS_PROP_READONLY_CB },
{ "yaw", kPlayerShip_yaw, OOJS_PROP_READWRITE_CB },
{ 0 }
};
@ -761,6 +761,30 @@ static JSBool PlayerShipSetProperty(JSContext *context, JSObject *this, jsid pro
}
break;
case kPlayerShip_pitch:
if (JS_ValueToNumber(context, *value, &fValue))
{
[player decrease_flight_pitch:[player flightPitch] + fValue];
return YES;
}
break;
case kPlayerShip_roll:
if (JS_ValueToNumber(context, *value, &fValue))
{
[player decrease_flight_roll:[player flightRoll] + fValue];
return YES;
}
break;
case kPlayerShip_yaw:
if (JS_ValueToNumber(context, *value, &fValue))
{
[player decrease_flight_yaw:[player flightYaw] + fValue];
return YES;
}
break;
case kPlayerShip_forwardShield:
if (JS_ValueToNumber(context, *value, &fValue))
{