Unstable v0.19.3.0

This commit is contained in:
Juan Pablo Arce
2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -508,7 +508,14 @@ namespace Barotrauma
try
{
return (float)PropertyInfo.GetValue(parentObject, null);
if (PropertyType == typeof(int))
{
return (int)PropertyInfo.GetValue(parentObject, null);
}
else
{
return (float)PropertyInfo.GetValue(parentObject, null);
}
}
catch (TargetInvocationException e)
{
@@ -308,7 +308,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
}
@@ -331,7 +331,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
return val;
@@ -350,7 +350,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
return val;
@@ -369,7 +369,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
return val;
@@ -388,7 +388,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
return val;
@@ -413,7 +413,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
}
@@ -438,7 +438,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
}
@@ -540,7 +540,7 @@ namespace Barotrauma
}
catch (Exception e)
{
DebugConsole.ThrowError("Error in " + element + "! ", e);
DebugConsole.ThrowError($"Error when reading attribute \"{name}\" from {element}!", e);
}
}