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

Added oolite-default-effect-script.js to Xcode project. Removed copy-and-pasted comment about legacy script actions.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5303 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2012-09-08 18:46:54 +00:00
parent 1b3deee3ed
commit fa2cf4c9f5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oolite.xcodeproj/project.pbxproj
View File

@ -440,6 +440,7 @@
1A572FCD0D84B640003D4A26 /* oolite-thargoid-warship.js in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 1A572FC20D84B640003D4A26 /* oolite-thargoid-warship.js */; };
1A572FE50D84B6A3003D4A26 /* oolite-constrictor-AI.plist in Copy AIs */ = {isa = PBXBuildFile; fileRef = 1A572FE40D84B6A3003D4A26 /* oolite-constrictor-AI.plist */; };
1A5AA3230C0098AF0029C78A /* OOOpenGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A5AA3220C0098AF0029C78A /* OOOpenGL.m */; };
1A5ABE6B15FBC86F006C97DC /* oolite-default-effect-script.js in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 1A5ABE6A15FBC833006C97DC /* oolite-default-effect-script.js */; };
1A5DB1EA0BBD8F0000D57389 /* OOConstToString.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5DB1E80BBD8F0000D57389 /* OOConstToString.h */; };
1A5DB1EB0BBD8F0000D57389 /* OOConstToString.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A5DB1E90BBD8F0000D57389 /* OOConstToString.m */; };
1A5DBAA60BC000DC00D57389 /* OOJavaScriptEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5DBA9A0BC000DC00D57389 /* OOJavaScriptEngine.h */; };
@ -1211,6 +1212,7 @@
dstPath = Scripts;
dstSubfolderSpec = 7;
files = (
1A5ABE6B15FBC86F006C97DC /* oolite-default-effect-script.js in Copy Scripts */,
1AE45E5A12EB177B00B570E1 /* oolite-constrictor-pilot.js in Copy Scripts */,
1AE45E5C12EB178100B570E1 /* oolite-locale-functions.js in Copy Scripts */,
1A01BC7011C5515B0011197F /* oolite-default-player-script.js in Copy Scripts */,
@ -1719,6 +1721,7 @@
1A572FC20D84B640003D4A26 /* oolite-thargoid-warship.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "oolite-thargoid-warship.js"; sourceTree = "<group>"; };
1A572FE40D84B6A3003D4A26 /* oolite-constrictor-AI.plist */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = "oolite-constrictor-AI.plist"; sourceTree = "<group>"; };
1A5AA3220C0098AF0029C78A /* OOOpenGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = OOOpenGL.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
1A5ABE6A15FBC833006C97DC /* oolite-default-effect-script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "oolite-default-effect-script.js"; sourceTree = "<group>"; };
1A5DB1E80BBD8F0000D57389 /* OOConstToString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOConstToString.h; sourceTree = "<group>"; };
1A5DB1E90BBD8F0000D57389 /* OOConstToString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOConstToString.m; sourceTree = "<group>"; };
1A5DBA9A0BC000DC00D57389 /* OOJavaScriptEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOJavaScriptEngine.h; sourceTree = "<group>"; };
@ -2561,6 +2564,7 @@
1A572FB80D84B640003D4A26 /* oolite-nova-mission.js */,
1A572FB90D84B640003D4A26 /* oolite-thargoid-plans-mission.js */,
1A572FBA0D84B640003D4A26 /* oolite-trumbles-mission.js */,
1A5ABE6A15FBC833006C97DC /* oolite-default-effect-script.js */,
1A01BC6F11C5515B0011197F /* oolite-default-player-script.js */,
1A572FBB0D84B640003D4A26 /* oolite-default-ship-script.js */,
1A572FBC0D84B640003D4A26 /* oolite-cloaking-device-mission.js */,

2
Resources/Scripts/oolite-default-effect-script.js
View File

@ -2,7 +2,7 @@
oolite-default-ship-effect.js
Standard ship script; handles legacy foo_actions.
Standard visual effect script.
Oolite

4
src/Core/Scripting/OOJSEntity.m
View File

@ -86,7 +86,7 @@ enum
kEntity_isSun, // is sun, boolean, read-only.
kEntity_isValid, // is not stale, boolean, read-only.
kEntity_isVisible, // is within drawing distance, boolean, read-only.
kEntity_isVisualEffect, // is visual effect, boolean, read-only.
kEntity_isVisualEffect, // is visual effect, boolean, read-only.
};
@ -114,7 +114,7 @@ static JSPropertySpec sEntityProperties[] =
{ "isSun", kEntity_isSun, OOJS_PROP_READONLY_CB },
{ "isValid", kEntity_isValid, OOJS_PROP_READONLY_CB },
{ "isVisible", kEntity_isVisible, OOJS_PROP_READONLY_CB },
{ "isVisualEffect", kEntity_isVisualEffect, OOJS_PROP_READONLY_CB },
{ "isVisualEffect", kEntity_isVisualEffect, OOJS_PROP_READONLY_CB },
{ 0 }
};