correction due to lab 5
This commit is contained in:
parent
3cc7bee7ad
commit
6f06ed0ff6
@ -28,17 +28,16 @@ public class EntitySAU: BaseSAU
|
|||||||
|
|
||||||
public override string[] GetStringRepresentation()
|
public override string[] GetStringRepresentation()
|
||||||
{
|
{
|
||||||
return new[] { nameof(EntitySAU), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Guns.ToString() };
|
return new[] { nameof(EntitySAU), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Tracks.ToString(), Guns.ToString() };
|
||||||
}
|
}
|
||||||
|
|
||||||
public static EntitySAU? CreateEntitySAU(string[] strs)
|
public static EntitySAU? CreateEntitySAU(string[] strs)
|
||||||
{
|
{
|
||||||
if (strs.Length != 6 || strs[0] != nameof(EntitySAU))
|
if (strs.Length != 7 || strs[0] != nameof(EntitySAU))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new EntitySAU(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]),
|
return new EntitySAU(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
|
||||||
Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,7 @@ namespace Project_SelfPropelledArtilleryUnit;
|
|||||||
public partial class FormSAUConfig : Form
|
public partial class FormSAUConfig : Form
|
||||||
{
|
{
|
||||||
private DrawingBase? _drawingBase;
|
private DrawingBase? _drawingBase;
|
||||||
//нужно заменить на то как это реализовано у вики
|
|
||||||
private event Action<DrawingBase>? SauDelegate;
|
private event Action<DrawingBase>? SauDelegate;
|
||||||
public FormSAUConfig()
|
public FormSAUConfig()
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user