# HG changeset patch # User rubidium # Date 1196623426 0 # Node ID 9b2d21bf71ba5ee085cddad603ffd7401a7f4a5c # Parent 2ba28bc428f16334b5a21e23a6c95fe9ac2a0133 (svn r11560) -Codechange: replace 'custom' version of FindLastBit with the generic. diff -r 2ba28bc428f1 -r 9b2d21bf71ba src/airport.cpp --- a/src/airport.cpp Sun Dec 02 19:21:56 2007 +0000 +++ b/src/airport.cpp Sun Dec 02 19:23:46 2007 +0000 @@ -431,18 +431,6 @@ "DUMMY" // extra heading for 255 }; -static uint AirportBlockToString(uint32 block) -{ - uint i = 0; - if (block & 0xffff0000) { block >>= 16; i += 16; } - if (block & 0x0000ff00) { block >>= 8; i += 8; } - if (block & 0x000000f0) { block >>= 4; i += 4; } - if (block & 0x0000000c) { block >>= 2; i += 2; } - if (block & 0x00000002) { i += 1; } - return i; -} - - static void AirportPrintOut(uint nofelements, const AirportFTA *layout, bool full_report) { if (!full_report) printf("(P = Current Position; NP = Next Position)\n"); @@ -453,7 +441,7 @@ byte heading = (current->heading == 255) ? MAX_HEADINGS + 1 : current->heading; printf("\tPos:%2d NPos:%2d Heading:%15s Block:%2d\n", current->position, current->next_position, _airport_heading_strings[heading], - AirportBlockToString(current->block)); + FindLastBit(current->block)); } else { printf("P:%2d NP:%2d", current->position, current->next_position); }