diff options
| -rw-r--r-- | src/airport_gui.cpp | 2 | ||||
| -rw-r--r-- | src/cargopacket.cpp | 2 | ||||
| -rw-r--r-- | src/hotkeys.cpp | 2 | ||||
| -rw-r--r-- | src/industry_gui.cpp | 2 | ||||
| -rw-r--r-- | src/order_gui.cpp | 2 | ||||
| -rw-r--r-- | src/timetable_gui.cpp | 2 | ||||
| -rw-r--r-- | src/vehicle.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 57a843496..649fef4a2 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -551,7 +551,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = { NWidget(NWID_VSCROLLBAR, COLOUR_GREY, BAIRW_SCROLLBAR), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, BAIRW_LAYOUT_DECREASE), SetMinimalSize(12, 0),SetDataTip(AWV_DECREASE, STR_NULL), + NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, BAIRW_LAYOUT_DECREASE), SetMinimalSize(12, 0), SetDataTip(AWV_DECREASE, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, BAIRW_LAYOUT_NUM), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NULL), NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, BAIRW_LAYOUT_INCREASE), SetMinimalSize(12, 0), SetDataTip(AWV_INCREASE, STR_NULL), EndContainer(), diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index 37091fd66..676e408ea 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -276,7 +276,7 @@ bool CargoList<Tinst>::MoveTo(Tother_inst *dest, uint max_move, MoveToAction mta max_move -= cp->count; this->packets.erase(it++); static_cast<Tinst *>(this)->RemoveFromCache(cp); - switch(mta) { + switch (mta) { case MTA_FINAL_DELIVERY: payment->PayFinalDelivery(cp, cp->count); delete cp; diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp index ae8d0a356..8619bd694 100644 --- a/src/hotkeys.cpp +++ b/src/hotkeys.cpp @@ -73,7 +73,7 @@ static uint16 ParseCode(const char *start, const char *end) } } if (end - start == 1) { - if (*start >= 'a' && *start <= 'z') return *start - ('a' - 'A'); + if (*start >= 'a' && *start <= 'z') return *start - ('a'-'A'); return *start; } return 0; diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index dd4773bd5..b865dfd72 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -796,7 +796,7 @@ public: virtual void SetStringParameters(int widget) const { - if (widget== IVW_CAPTION) SetDParam(0, this->window_number); + if (widget == IVW_CAPTION) SetDParam(0, this->window_number); } virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) diff --git a/src/order_gui.cpp b/src/order_gui.cpp index bdcf9c1cf..2ad2893e4 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -1428,7 +1428,7 @@ public: static Hotkey<OrdersWindow> order_hotkeys[]; }; -Hotkey<OrdersWindow> OrdersWindow::order_hotkeys[]= { +Hotkey<OrdersWindow> OrdersWindow::order_hotkeys[] = { Hotkey<OrdersWindow>('D', "skip", 0, &OrdersWindow::OrderClick_Skip), Hotkey<OrdersWindow>('F', "delete", 0, &OrdersWindow::OrderClick_Delete), Hotkey<OrdersWindow>('G', "goto", 0, &OrdersWindow::OrderClick_Goto), diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index fdd308bed..6fcd5e9f8 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -395,7 +395,7 @@ struct TimetableWindow : Window { TextColour colour = (i == selected) ? TC_WHITE : TC_BLACK; if (order->IsType(OT_CONDITIONAL)) { string = STR_TIMETABLE_NO_TRAVEL; - } else if(order->IsType(OT_AUTOMATIC)) { + } else if (order->IsType(OT_AUTOMATIC)) { string = STR_TIMETABLE_NOT_TIMETABLEABLE; colour = ((i == selected) ? TC_SILVER : TC_GREY) | TC_NO_SHADE; } else if (order->travel_time == 0) { diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d5b2b5c60..f69cf03a5 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2242,7 +2242,7 @@ void Vehicle::RemoveFromShared() Order *Vehicle::GetNextManualOrder(int index) const { Order *order = this->GetOrder(index); - while(order != NULL && order->IsType(OT_AUTOMATIC)) { + while (order != NULL && order->IsType(OT_AUTOMATIC)) { order = order->next; } return order; |