abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Minor bug fixes

Browse Source 
This was SVN commit r1223.
This commit is contained in:
Ykkrosh 2004-10-07 20:02:58 +00:00
parent 3469e90636
commit 53719430d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/simulation/Entity.cpp
View File

@ -546,7 +546,7 @@ JSBool CEntity::Construct( JSContext* cx, JSObject* obj, unsigned int argc, jsva
if( !baseEntity ) if( !baseEntity )
{ {
*rval = JSVAL_NULL; *rval = JSVAL_NULL;
JS_ReportError( cx, "No such template: %ls", CStr8(templateName).c_str() ); JS_ReportError( cx, "No such template: %s", CStr8(templateName).c_str() );
return( JS_TRUE ); return( JS_TRUE );
} }
@ -619,8 +619,8 @@ bool CEntity::Order( JSContext* cx, uintN argc, jsval* argv, bool Queued )
} }
try try
{ {
newOrder.m_data[0].location.x = g_ScriptingHost.ValueToDouble( argv[1] ); newOrder.m_data[0].location.x = (float)g_ScriptingHost.ValueToDouble( argv[1] );
newOrder.m_data[0].location.y = g_ScriptingHost.ValueToDouble( argv[2] ); newOrder.m_data[0].location.y = (float)g_ScriptingHost.ValueToDouble( argv[2] );
} }
catch( PSERROR_Scripting_ConversionFailed ) catch( PSERROR_Scripting_ConversionFailed )
{ {

2
source/simulation/scripting/JSInterface_Entity.cpp
View File

@ -106,7 +106,7 @@ JSBool JSI_Entity::construct( JSContext* cx, JSObject* obj, unsigned int argc, j
if( !baseEntity ) if( !baseEntity )
{ {
*rval = JSVAL_NULL; *rval = JSVAL_NULL;
JS_ReportError( cx, "No such template: %ls", CStr8(templateName).c_str() ); JS_ReportError( cx, "No such template: %s", CStr8(templateName).c_str() );
return( JS_TRUE ); return( JS_TRUE );
} }
JSI_Vector3D::Vector3D_Info* jsVector3D = NULL; JSI_Vector3D::Vector3D_Info* jsVector3D = NULL;