Fixed JS ship properties that weren't updated properly in r4169.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4177 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton
parent
24a6856f44
commit
2fd63cfc12
@ -767,7 +767,7 @@
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 1A0519340C7CCAC900BA5CCA /* DebugOXP.xcodeproj */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = 8D5B49AC048680CD000E48DA /* DebugOXP */;
|
||||
remoteGlobalIDString = 8D5B49AC048680CD000E48DA;
|
||||
remoteInfo = DebugOXP;
|
||||
};
|
||||
1A78B5D812D74CF900D42EE7 /* PBXContainerItemProxy */ = {
|
||||
|
||||
@ -207,79 +207,79 @@ static JSPropertySpec sShipProperties[] =
|
||||
{ "cargoSpaceCapacity", kShip_cargoSpaceCapacity, OOJS_PROP_READONLY_CB },
|
||||
{ "cargoSpaceAvailable", kShip_cargoSpaceAvailable, OOJS_PROP_READONLY_CB },
|
||||
// contracts instead of cargo to distinguish them from the manifest
|
||||
{ "contracts", kShip_contracts, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "cloakAutomatic", kShip_cloakAutomatic, JSPROP_PERMANENT | JSPROP_ENUMERATE},
|
||||
{ "cruiseSpeed", kShip_cruiseSpeed, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "desiredSpeed", kShip_desiredSpeed, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "displayName", kShip_displayName, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "entityPersonality", kShip_entityPersonality, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "equipment", kShip_equipment, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "escorts", kShip_escorts, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "escortGroup", kShip_escortGroup, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "forwardWeapon", kShip_forwardWeapon, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "fuel", kShip_fuel, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "fuelChargeRate", kShip_fuelChargeRate, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "group", kShip_group, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "hasHostileTarget", kShip_hasHostileTarget, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "hasHyperspaceMotor", kShip_hasHyperspaceMotor, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "hasSuspendedAI", kShip_hasSuspendedAI, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "heatInsulation", kShip_heatInsulation, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "heading", kShip_heading, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isBeacon", kShip_isBeacon, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isCloaked", kShip_isCloaked, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "isCargo", kShip_isCargo, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isDerelict", kShip_isDerelict, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isFrangible", kShip_isFrangible, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isJamming", kShip_isJamming, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isMine", kShip_isMine, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isMissile", kShip_isMissile, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isPiloted", kShip_isPiloted, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isPirate", kShip_isPirate, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isPirateVictim", kShip_isPirateVictim, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isPlayer", kShip_isPlayer, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isPolice", kShip_isPolice, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isRock", kShip_isRock, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isBoulder", kShip_isBoulder, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "isThargoid", kShip_isThargoid, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isTrader", kShip_isTrader, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "isWeapon", kShip_isWeapon, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "lightsActive", kShip_lightsActive, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "maxSpeed", kShip_maxSpeed, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "maxThrust", kShip_maxThrust, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "missileCapacity", kShip_missileCapacity, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "missileLoadTime", kShip_missileLoadTime, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "missiles", kShip_missiles, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "name", kShip_name, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "passengerCount", kShip_passengerCount, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "passengerCapacity", kShip_passengerCapacity, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "passengers", kShip_passengers, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "portWeapon", kShip_portWeapon, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "potentialCollider", kShip_potentialCollider, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "primaryRole", kShip_primaryRole, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "reportAIMessages", kShip_reportAIMessages, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "roleWeights", kShip_roleWeights, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "roles", kShip_roles, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "savedCoordinates", kShip_savedCoordinates, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "scannerDisplayColor1", kShip_scannerDisplayColor1, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "scannerDisplayColor2", kShip_scannerDisplayColor2, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "scannerRange", kShip_scannerRange, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "script", kShip_script, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "scriptInfo", kShip_scriptInfo, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "speed", kShip_speed, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "starboardWeapon", kShip_starboardWeapon, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "subEntities", kShip_subEntities, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "subEntityCapacity", kShip_subEntityCapacity, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "target", kShip_target, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "temperature", kShip_temperature, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "thrust", kShip_thrust, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "thrustVector", kShip_thrustVector, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "trackCloseContacts", kShip_trackCloseContacts, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "vectorForward", kShip_vectorForward, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "vectorRight", kShip_vectorRight, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "vectorUp", kShip_vectorUp, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "velocity", kShip_velocity, JSPROP_PERMANENT | JSPROP_ENUMERATE },
|
||||
{ "weaponRange", kShip_weaponRange, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "withinStationAegis", kShip_withinStationAegis, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
|
||||
{ "contracts", kShip_contracts, OOJS_PROP_READONLY_CB },
|
||||
{ "cloakAutomatic", kShip_cloakAutomatic, OOJS_PROP_READWRITE_CB},
|
||||
{ "cruiseSpeed", kShip_cruiseSpeed, OOJS_PROP_READONLY_CB },
|
||||
{ "desiredSpeed", kShip_desiredSpeed, OOJS_PROP_READWRITE_CB },
|
||||
{ "displayName", kShip_displayName, OOJS_PROP_READWRITE_CB },
|
||||
{ "entityPersonality", kShip_entityPersonality, OOJS_PROP_READONLY_CB },
|
||||
{ "equipment", kShip_equipment, OOJS_PROP_READONLY_CB },
|
||||
{ "escorts", kShip_escorts, OOJS_PROP_READONLY_CB },
|
||||
{ "escortGroup", kShip_escortGroup, OOJS_PROP_READONLY_CB },
|
||||
{ "forwardWeapon", kShip_forwardWeapon, OOJS_PROP_READONLY_CB },
|
||||
{ "fuel", kShip_fuel, OOJS_PROP_READWRITE_CB },
|
||||
{ "fuelChargeRate", kShip_fuelChargeRate, OOJS_PROP_READONLY_CB },
|
||||
{ "group", kShip_group, OOJS_PROP_READWRITE_CB },
|
||||
{ "hasHostileTarget", kShip_hasHostileTarget, OOJS_PROP_READONLY_CB },
|
||||
{ "hasHyperspaceMotor", kShip_hasHyperspaceMotor, OOJS_PROP_READONLY_CB },
|
||||
{ "hasSuspendedAI", kShip_hasSuspendedAI, OOJS_PROP_READONLY_CB },
|
||||
{ "heatInsulation", kShip_heatInsulation, OOJS_PROP_READWRITE_CB },
|
||||
{ "heading", kShip_heading, OOJS_PROP_READONLY_CB },
|
||||
{ "isBeacon", kShip_isBeacon, OOJS_PROP_READONLY_CB },
|
||||
{ "isCloaked", kShip_isCloaked, OOJS_PROP_READWRITE_CB },
|
||||
{ "isCargo", kShip_isCargo, OOJS_PROP_READONLY_CB },
|
||||
{ "isDerelict", kShip_isDerelict, OOJS_PROP_READONLY_CB },
|
||||
{ "isFrangible", kShip_isFrangible, OOJS_PROP_READONLY_CB },
|
||||
{ "isJamming", kShip_isJamming, OOJS_PROP_READONLY_CB },
|
||||
{ "isMine", kShip_isMine, OOJS_PROP_READONLY_CB },
|
||||
{ "isMissile", kShip_isMissile, OOJS_PROP_READONLY_CB },
|
||||
{ "isPiloted", kShip_isPiloted, OOJS_PROP_READONLY_CB },
|
||||
{ "isPirate", kShip_isPirate, OOJS_PROP_READONLY_CB },
|
||||
{ "isPirateVictim", kShip_isPirateVictim, OOJS_PROP_READONLY_CB },
|
||||
{ "isPlayer", kShip_isPlayer, OOJS_PROP_READONLY_CB },
|
||||
{ "isPolice", kShip_isPolice, OOJS_PROP_READONLY_CB },
|
||||
{ "isRock", kShip_isRock, OOJS_PROP_READONLY_CB },
|
||||
{ "isBoulder", kShip_isBoulder, OOJS_PROP_READWRITE_CB },
|
||||
{ "isThargoid", kShip_isThargoid, OOJS_PROP_READONLY_CB },
|
||||
{ "isTrader", kShip_isTrader, OOJS_PROP_READONLY_CB },
|
||||
{ "isWeapon", kShip_isWeapon, OOJS_PROP_READONLY_CB },
|
||||
{ "lightsActive", kShip_lightsActive, OOJS_PROP_READWRITE_CB },
|
||||
{ "maxSpeed", kShip_maxSpeed, OOJS_PROP_READONLY_CB },
|
||||
{ "maxThrust", kShip_maxThrust, OOJS_PROP_READONLY_CB },
|
||||
{ "missileCapacity", kShip_missileCapacity, OOJS_PROP_READONLY_CB },
|
||||
{ "missileLoadTime", kShip_missileLoadTime, OOJS_PROP_READWRITE_CB },
|
||||
{ "missiles", kShip_missiles, OOJS_PROP_READONLY_CB },
|
||||
{ "name", kShip_name, OOJS_PROP_READWRITE_CB },
|
||||
{ "passengerCount", kShip_passengerCount, OOJS_PROP_READONLY_CB },
|
||||
{ "passengerCapacity", kShip_passengerCapacity, OOJS_PROP_READONLY_CB },
|
||||
{ "passengers", kShip_passengers, OOJS_PROP_READONLY_CB },
|
||||
{ "portWeapon", kShip_portWeapon, OOJS_PROP_READONLY_CB },
|
||||
{ "potentialCollider", kShip_potentialCollider, OOJS_PROP_READONLY_CB },
|
||||
{ "primaryRole", kShip_primaryRole, OOJS_PROP_READWRITE_CB },
|
||||
{ "reportAIMessages", kShip_reportAIMessages, OOJS_PROP_READWRITE_CB },
|
||||
{ "roleWeights", kShip_roleWeights, OOJS_PROP_READONLY_CB },
|
||||
{ "roles", kShip_roles, OOJS_PROP_READONLY_CB },
|
||||
{ "savedCoordinates", kShip_savedCoordinates, OOJS_PROP_READWRITE_CB },
|
||||
{ "scannerDisplayColor1", kShip_scannerDisplayColor1, OOJS_PROP_READWRITE_CB },
|
||||
{ "scannerDisplayColor2", kShip_scannerDisplayColor2, OOJS_PROP_READWRITE_CB },
|
||||
{ "scannerRange", kShip_scannerRange, OOJS_PROP_READONLY_CB },
|
||||
{ "script", kShip_script, OOJS_PROP_READONLY_CB },
|
||||
{ "scriptInfo", kShip_scriptInfo, OOJS_PROP_READONLY_CB },
|
||||
{ "speed", kShip_speed, OOJS_PROP_READONLY_CB },
|
||||
{ "starboardWeapon", kShip_starboardWeapon, OOJS_PROP_READONLY_CB },
|
||||
{ "subEntities", kShip_subEntities, OOJS_PROP_READONLY_CB },
|
||||
{ "subEntityCapacity", kShip_subEntityCapacity, OOJS_PROP_READONLY_CB },
|
||||
{ "target", kShip_target, OOJS_PROP_READWRITE_CB },
|
||||
{ "temperature", kShip_temperature, OOJS_PROP_READWRITE_CB },
|
||||
{ "thrust", kShip_thrust, OOJS_PROP_READWRITE_CB },
|
||||
{ "thrustVector", kShip_thrustVector, OOJS_PROP_READWRITE_CB },
|
||||
{ "trackCloseContacts", kShip_trackCloseContacts, OOJS_PROP_READWRITE_CB },
|
||||
{ "vectorForward", kShip_vectorForward, OOJS_PROP_READONLY_CB },
|
||||
{ "vectorRight", kShip_vectorRight, OOJS_PROP_READONLY_CB },
|
||||
{ "vectorUp", kShip_vectorUp, OOJS_PROP_READONLY_CB },
|
||||
{ "velocity", kShip_velocity, OOJS_PROP_READWRITE_CB },
|
||||
{ "weaponRange", kShip_weaponRange, OOJS_PROP_READONLY_CB },
|
||||
{ "withinStationAegis", kShip_withinStationAegis, OOJS_PROP_READONLY_CB },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user