summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/network/network.cpp2
-rw-r--r--src/network/network_gui.cpp16
-rw-r--r--src/settings.cpp6
-rw-r--r--src/table/sprites.h2
-rw-r--r--src/train_cmd.cpp4
-rw-r--r--src/window.cpp2
6 files changed, 16 insertions, 16 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 6b3137e82..cbd3e2fd2 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -202,7 +202,7 @@ void NetworkTextMessage(NetworkAction action, ConsoleColour color, bool self_sen
case NETWORK_ACTION_GIVE_MONEY: strid = self_send ? STR_NETWORK_GAVE_MONEY_AWAY : STR_NETWORK_GIVE_MONEY; break;
case NETWORK_ACTION_CHAT_COMPANY: strid = self_send ? STR_NETWORK_CHAT_TO_COMPANY : STR_NETWORK_CHAT_COMPANY; break;
case NETWORK_ACTION_CHAT_CLIENT: strid = self_send ? STR_NETWORK_CHAT_TO_CLIENT : STR_NETWORK_CHAT_CLIENT; break;
- default: strid = STR_NETWORK_CHAT_ALL; break;
+ default: strid = STR_NETWORK_CHAT_ALL; break;
}
char message[1024];
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 380bf9060..7e3483501 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -608,7 +608,7 @@ public:
EventState state = ES_NOT_HANDLED;
/* handle up, down, pageup, pagedown, home and end */
- if (keycode == WKC_UP || keycode == WKC_DOWN || keycode == WKC_PAGEUP || keycode == WKC_PAGEDOWN || keycode == WKC_HOME || keycode == WKC_END) {
+ if (keycode == WKC_UP || keycode == WKC_DOWN || keycode == WKC_PAGEUP || keycode == WKC_PAGEDOWN || keycode == WKC_HOME || keycode == WKC_END) {
if (this->servers.Length() == 0) return ES_HANDLED;
switch (keycode) {
case WKC_UP:
@@ -642,15 +642,15 @@ public:
default: break;
}
- this->server = this->servers[this->list_pos];
+ this->server = this->servers[this->list_pos];
- /* scroll to the new server if it is outside the current range */
- this->ScrollToSelectedServer();
+ /* scroll to the new server if it is outside the current range */
+ this->ScrollToSelectedServer();
- /* redraw window */
- this->SetDirty();
- return ES_HANDLED;
- }
+ /* redraw window */
+ this->SetDirty();
+ return ES_HANDLED;
+ }
if (this->field != NGWW_CLIENT) {
if (this->server != NULL) {
diff --git a/src/settings.cpp b/src/settings.cpp
index 665ada9d9..a329be0b9 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1457,9 +1457,9 @@ const SettingDesc _patch_settings[] = {
SDTC_BOOL(gui.show_track_reservation, S, 0, false, STR_CONFIG_PATCHES_SHOW_TRACK_RESERVATION, RedrawScreen),
SDTC_VAR(gui.default_signal_type, SLE_UINT8, S, MS, 0, 0, 2, 1, STR_CONFIG_PATCHES_DEFAULT_SIGNAL_TYPE, NULL),
SDTC_VAR(gui.cycle_signal_types, SLE_UINT8, S, MS, 0, 0, 2, 1, STR_CONFIG_PATCHES_CYCLE_SIGNAL_TYPES, NULL),
- SDTC_VAR(gui.station_numtracks, SLE_UINT8, S, 0, 1, 1, 7, 0, STR_NULL, NULL),
- SDTC_VAR(gui.station_platlength, SLE_UINT8, S, 0, 5, 1, 7, 0, STR_NULL, NULL),
- SDTC_BOOL(gui.station_dragdrop, S, 0, true, STR_NULL, NULL),
+ SDTC_VAR(gui.station_numtracks, SLE_UINT8, S, 0, 1, 1, 7, 0, STR_NULL, NULL),
+ SDTC_VAR(gui.station_platlength, SLE_UINT8, S, 0, 5, 1, 7, 0, STR_NULL, NULL),
+ SDTC_BOOL(gui.station_dragdrop, S, 0, true, STR_NULL, NULL),
SDTC_BOOL(gui.station_show_coverage, S, 0, false, STR_NULL, NULL),
SDTC_BOOL(gui.persistent_buildingtools, S, 0, false, STR_CONFIG_PATCHES_PERSISTENT_BUILDINGTOOLS, NULL),
diff --git a/src/table/sprites.h b/src/table/sprites.h
index d3091e41c..31f59134a 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -145,7 +145,7 @@ enum Sprites {
AQUEDUCT_SPRITE_COUNT = 8,
/* Sprites for 'highlighting' tracks on sloped land. */
- SPR_TRACKS_FOR_SLOPES_BASE = SPR_AQUEDUCT_BASE + AQUEDUCT_SPRITE_COUNT,
+ SPR_TRACKS_FOR_SLOPES_BASE = SPR_AQUEDUCT_BASE + AQUEDUCT_SPRITE_COUNT,
SPR_TRACKS_FOR_SLOPES_RAIL_BASE = SPR_TRACKS_FOR_SLOPES_BASE + 0,
SPR_TRACKS_FOR_SLOPES_MONO_BASE = SPR_TRACKS_FOR_SLOPES_BASE + 4,
SPR_TRACKS_FOR_SLOPES_MAGLEV_BASE = SPR_TRACKS_FOR_SLOPES_BASE + 8,
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 1d097f680..354e80cea 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1606,7 +1606,7 @@ static void MarkTrainAsStuck(Vehicle *v)
if (!HasBit(v->u.rail.flags, VRF_TRAIN_STUCK)) {
/* It is the first time the problem occured, set the "train stuck" flag. */
SetBit(v->u.rail.flags, VRF_TRAIN_STUCK);
- v->load_unload_time_rem = 0;
+ v->load_unload_time_rem = 0;
/* Stop train */
v->cur_speed = 0;
@@ -4359,7 +4359,7 @@ static void TrainLocoHandler(Vehicle *v, bool mode)
SetLastSpeed(v, v->cur_speed);
}
- if (v->progress == 0) v->progress = j; // Save unused spd for next time, if TrainController didn't set progress
+ if (v->progress == 0) v->progress = j; // Save unused spd for next time, if TrainController didn't set progress
}
diff --git a/src/window.cpp b/src/window.cpp
index 5f5bc91a8..32773982b 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -182,7 +182,7 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click)
}
} else if (wi->type == WWT_SCROLLBAR || wi->type == WWT_SCROLL2BAR || wi->type == WWT_HSCROLLBAR) {
ScrollbarClickHandler(w, wi, x, y);
- } else if (wi->type == WWT_EDITBOX) {
+ } else if (wi->type == WWT_EDITBOX) {
/* Open the OSK window if clicked on an edit box */
QueryStringBaseWindow *qs = dynamic_cast<QueryStringBaseWindow*>(w);
if (qs != NULL) {