gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Removes an unused codepath for AI deserialization and related ScriptInterface code.

Browse Source 
It might actually be needed again in the future, but I think even then
it would be easier to rewrite it than having to update the code in the
meantime.

Refs #2462

This was SVN commit r15600.
This commit is contained in:
Yves
2014-08-02 13:22:02 +00:00
parent 4028cd425e
commit 736d934107
3 changed files with 16 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptInterface.cpp
-43
View File
@@ -881,49 +881,6 @@ jsval ScriptInterface::CallConstructor(jsval ctor, uint argc, jsval argv)
return JS::ObjectValue(*JS_New(m->m_cx, &ctor.toObject(), argc, &argv));
}
jsval ScriptInterface::NewObjectFromConstructor(jsval ctor)
{
JSAutoRequest rq(m->m_cx);
if (!ctor.isObject())
{
LOGERROR(L"NewObjectFromConstructor: ctor is not an object");
return JS::UndefinedValue();
}
// Get the constructor's prototype
// (Can't use JS_GetPrototype, since we want .prototype not .__proto__)
JS::RootedValue protoVal(m->m_cx);
if (!JS_GetProperty(m->m_cx, &ctor.toObject(), "prototype", protoVal.address()))
{
LOGERROR(L"NewObjectFromConstructor: can't get prototype");
return JS::UndefinedValue();
}
if (!protoVal.isObject())
{
LOGERROR(L"NewObjectFromConstructor: prototype is not an object");
return JS::UndefinedValue();
}
JSObject* proto = &protoVal.toObject();
JSObject* parent = JS_GetParent(&ctor.toObject());
if (!proto || !parent)
{
LOGERROR(L"NewObjectFromConstructor: null proto/parent");
return JS::UndefinedValue();
}
JSObject* obj = JS_NewObject(m->m_cx, NULL, proto, parent);
if (!obj)
{
LOGERROR(L"NewObjectFromConstructor: object creation failed");
return JS::UndefinedValue();
}
return JS::ObjectValue(*obj);
}
void ScriptInterface::DefineCustomObjectType(JSClass *clasp, JSNative constructor, uint minArgs, JSPropertySpec *ps, JSFunctionSpec *fs, JSPropertySpec *static_ps, JSFunctionSpec *static_fs)
{
JSAutoRequest rq(m->m_cx);