lab6 some minor fixes

This commit is contained in:
Zakharov_Rostislav 2023-11-24 08:57:59 +04:00
parent a622dc90e0
commit 4112f3c97d

View File

@ -20,8 +20,8 @@ namespace ProjectBattleship.DrawingObjects
if (strs.Length == 6)
{
return new DrawingBattleship(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]),
Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[7]),
Convert.ToBoolean(strs[8]), width, height);
Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
Convert.ToBoolean(strs[5]), width, height);
}
return null;
}
@ -37,7 +37,7 @@ namespace ProjectBattleship.DrawingObjects
{
return str;
}
return $"{str}{separatorForObject}{battleship.AdditionalColor.Name}{separatorForObject}{separatorForObject}{battleship.Turret}{separatorForObject}{battleship.RocketLauncher}";
return $"{str}{separatorForObject}{battleship.AdditionalColor.Name}{separatorForObject}{battleship.Turret}{separatorForObject}{battleship.RocketLauncher}";
}
}
}