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

# Order system refactoring.

Browse Source 
This was SVN commit r4716.
This commit is contained in:
Matei
2006-12-21 14:57:13 +00:00
parent 805981519e
commit d672674bc6
12 changed files with 151 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/EntityScriptInterface.cpp
+6 -6
View File
@@ -280,8 +280,8 @@ bool CEntity::Order( JSContext* cx, uintN argc, jsval* argv, bool Queued )
JSU_REQUIRE_PARAMS_CPP(3);
try
{
newOrder.m_data[0].location.x = ToPrimitive<float>( argv[1] );
newOrder.m_data[0].location.y = ToPrimitive<float>( argv[2] );
newOrder.m_target_location.x = ToPrimitive<float>( argv[1] );
newOrder.m_target_location.y = ToPrimitive<float>( argv[2] );
}
catch( PSERROR_Scripting_ConversionFailed )
{
@@ -308,10 +308,10 @@ bool CEntity::Order( JSContext* cx, uintN argc, jsval* argv, bool Queued )
JS_ReportError( cx, "Invalid target" );
return( false );
}
newOrder.m_data[0].entity = target->me;
newOrder.m_target_entity = target->me;
try
{
newOrder.m_data[1].data = ToPrimitive<int>( argv[2] );
newOrder.m_action = ToPrimitive<int>( argv[2] );
}
catch( PSERROR_Scripting_ConversionFailed )
{
@@ -331,8 +331,8 @@ bool CEntity::Order( JSContext* cx, uintN argc, jsval* argv, bool Queued )
case CEntityOrder::ORDER_PRODUCE:
JSU_REQUIRE_PARAMS_CPP(3);
try {
newOrder.m_data[0].string = ToPrimitive<CStrW>(argv[2]);
newOrder.m_data[1].data = ToPrimitive<int>(argv[1]);
newOrder.m_produce_name = ToPrimitive<CStrW>(argv[2]);
newOrder.m_produce_type = ToPrimitive<int>(argv[1]);
}
catch( PSERROR_Scripting_ConversionFailed )
{