Merge pull request #208 from lilligreen/particleFix

Particle fixes (TorqueScript and TAML)

engine/source/2d/assets/ParticleAssetField.cc

@@ -670,8 +670,21 @@ void ParticleAssetField::onTamlCustomRead( const TamlCustomNode* pCustomNode )
         keys.push_back( key );
     }
 
-    // Set the value bounds.
-    setValueBounds( maxTime, minValue, maxValue, defaultValue );
+    // If value bounds are present but no keys, assign the field its default values.
+    if ( !keys.size() )
+    {
+        DataKey key;
+        key.mTime = getMinTime();
+        key.mValue = getDefaultValue();
+        keys.push_back( key );
+    }
+
+    // Did we read in any value bounds?
+    if ( mValueBoundsDirty )
+    {
+        // Set the value bounds.
+        setValueBounds( maxTime, minValue, maxValue, defaultValue );
+    }
 
     // Set the value scale.
     setValueScale( valueScale );

engine/source/2d/sceneobject/ParticlePlayer_ScriptBinding.h

@@ -250,7 +250,7 @@ ConsoleMethodWithDocs(ParticlePlayer, setEmitterPaused, ConsoleVoid, 4, 4, (paus
 */
 ConsoleMethodWithDocs(ParticlePlayer, getEmitterPaused, ConsoleBool, 3, 3, (emitterIndex))
 {
-    return object->getEmitterPaused( dAtob(argv[2]) );
+    return object->getEmitterPaused( dAtoi(argv[2]) );
 }
 
 //-----------------------------------------------------------------------------
@@ -273,7 +273,7 @@ ConsoleMethodWithDocs(ParticlePlayer, setEmitterVisible, ConsoleVoid, 4, 4, (vis
 */
 ConsoleMethodWithDocs(ParticlePlayer, getEmitterVisible, ConsoleBool, 3, 3, (emitterIndex))
 {
-    return object->getEmitterVisible( dAtob(argv[2]) );
+    return object->getEmitterVisible( dAtoi(argv[2]) );
 }
 
 ConsoleMethodGroupEndWithDocs(ParticlePlayer)