устранение конфликтов 2 и 3 ветки

This commit is contained in:
Мельников Игорь 2022-10-20 17:06:14 +04:00
commit 2b0d5459ce
3 changed files with 6 additions and 6 deletions
Locomotives/Locomotives

View File

@ -26,9 +26,9 @@
_map = new int[100, 100];
_size_x = (float)_width / _map.GetLength(0);
_size_y = (float)_height / _map.GetLength(1);
for (int i = 0; i < _map.GetLength(0); ++i)
for (int i = 0; i < _map.GetLength(0); i++)
{
for (int j = 0; j < _map.GetLength(1); ++j)
for (int j = 0; j < _map.GetLength(1); j++)
{
_map[i, j] = _freeRoad;
}

View File

@ -26,9 +26,9 @@
_map = new int[100, 100];
_size_x = (float)_width / _map.GetLength(0);
_size_y = (float)_height / _map.GetLength(1);
for (int i = 0; i < _map.GetLength(0); ++i)
for (int i = 0; i < _map.GetLength(0); i++)
{
for (int j = 0; j < _map.GetLength(1); ++j)
for (int j = 0; j < _map.GetLength(1); j++)
{
_map[i, j] = _freeRoad;
}

View File

@ -27,9 +27,9 @@
_size_x = (float)_width / _map.GetLength(0);
_size_y = (float)_height / _map.GetLength(1);
int counter = 0;
for (int i = 0; i < _map.GetLength(0); ++i)
for (int i = 0; i < _map.GetLength(0); i++)
{
for (int j = 0; j < _map.GetLength(1); ++j)
for (int j = 0; j < _map.GetLength(1); j++)
{
_map[i, j] = _freeRoad;
}