fixed potential first class expection on textAtom attributes.

debreuil · May 5, 2010 · 3b4b75b · 3b4b75b
1 parent 9c337ff
commit 3b4b75b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/SwfNet.suo b/SwfNet.suo
diff --git a/V2DRuntime/Display/Screen.cs b/V2DRuntime/Display/Screen.cs
@@ -143,8 +143,9 @@ public override void Initialize()
         }
 
 		public override void Added(EventArgs e)
-		{
-			base.Added(e);
+		{
+            base.Added(e); 
+
 			V2DGame.instance.SetSize(v2dWorld.Width, v2dWorld.Height);
 			Activate();
 		}

diff --git a/V2DRuntime/Display/TextAtom.cs b/V2DRuntime/Display/TextAtom.cs
@@ -94,11 +94,15 @@ private float GetAttributeValue(string s, string attributeName)
 			string val;
 			try
 			{
-				val = GetAttributeValueString(s, attributeName);
-				result = float.Parse(val, NumberStyles.Any);
+				val = GetAttributeValueString(s, attributeName);
+                if (val != "")
+                {
+                    result = float.Parse(val, NumberStyles.Any);
+                }
 			}
 			catch (Exception)
-			{
+			{
+                Console.WriteLine("Error with attribute. Name: " + attributeName + "  String: " + s);
 			}
 
 			return result;

diff --git a/VexTo2DPhysics/VexTree.cs b/VexTo2DPhysics/VexTree.cs
@@ -892,12 +892,12 @@ private bool IsVex2DSymbol(IDefinition def)
             {
                 for (int i = 0; i < ((Timeline)def).Instances.Count; i++)
                 {
-                    IInstance inst = ((Timeline)def).Instances[i];
-                    IDefinition def2 = curVo.Definitions[inst.DefinitionId];
-                    result = def2 is Symbol ? IsVex2DSymbol(def2) : false;
-                    if (result)
-                    {
-                        break;
+                    IInstance inst = ((Timeline)def).Instances[i];
+                    IDefinition def2 = curVo.Definitions[inst.DefinitionId];
+                    result = def2 is Symbol ? IsVex2DSymbol(def2) : false;
+                    if (result)
+                    {
+                        break;
                     }
                 }
             }