equal
deleted
inserted
replaced
1836 const AirportFTA *next = &apc->layout[current_pos->next_position]; |
1836 const AirportFTA *next = &apc->layout[current_pos->next_position]; |
1837 |
1837 |
1838 // same block, then of course we can move |
1838 // same block, then of course we can move |
1839 if (apc->layout[current_pos->position].block != next->block) { |
1839 if (apc->layout[current_pos->position].block != next->block) { |
1840 const Station *st = GetStation(v->u.air.targetairport); |
1840 const Station *st = GetStation(v->u.air.targetairport); |
1841 uint32 airport_flags = next->block; |
1841 uint64 airport_flags = next->block; |
1842 |
1842 |
1843 // check additional possible extra blocks |
1843 // check additional possible extra blocks |
1844 if (current_pos != reference && current_pos->block != NOTHING_block) { |
1844 if (current_pos != reference && current_pos->block != NOTHING_block) { |
1845 airport_flags |= current_pos->block; |
1845 airport_flags |= current_pos->block; |
1846 } |
1846 } |
1860 AirportFTA *next = &apc->layout[current_pos->next_position]; |
1860 AirportFTA *next = &apc->layout[current_pos->next_position]; |
1861 AirportFTA *reference = &apc->layout[v->u.air.pos]; |
1861 AirportFTA *reference = &apc->layout[v->u.air.pos]; |
1862 |
1862 |
1863 // if the next position is in another block, check it and wait until it is free |
1863 // if the next position is in another block, check it and wait until it is free |
1864 if ((apc->layout[current_pos->position].block & next->block) != next->block) { |
1864 if ((apc->layout[current_pos->position].block & next->block) != next->block) { |
1865 uint32 airport_flags = next->block; |
1865 uint64 airport_flags = next->block; |
1866 Station* st = GetStation(v->u.air.targetairport); |
1866 Station* st = GetStation(v->u.air.targetairport); |
1867 //search for all all elements in the list with the same state, and blocks != N |
1867 //search for all all elements in the list with the same state, and blocks != N |
1868 // this means more blocks should be checked/set |
1868 // this means more blocks should be checked/set |
1869 AirportFTA *current = current_pos; |
1869 AirportFTA *current = current_pos; |
1870 if (current == reference) current = current->next; |
1870 if (current == reference) current = current->next; |