cpp/openttd-patchpack/source Changeset - r10641:28b35ec7c5ae

Changeset - r10641:28b35ec7c5ae

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

rubidium - 16 years ago 2009-01-09 22:48:57
rubidium@openttd.org

(svn r14943) -Cleanup: remove some rogue spaces/replace some rogue tabs with spaces

6 files changed with 16 insertions and 16 deletions:

src/network/network.cpp

src/network/network_gui.cpp

src/settings.cpp

src/table/sprites.h

src/train_cmd.cpp

src/window.cpp

0 comments (0 inline, 0 general)

src/network/network.cpp

➞

Show inline comments

@@ @@ -199,13 +199,13 @@ void NetworkTextMessage(NetworkAction ac @@
 		case NETWORK_ACTION_JOIN:           strid = STR_NETWORK_CLIENT_JOINED; break;
 		case NETWORK_ACTION_LEAVE:          strid = STR_NETWORK_CLIENT_LEFT; break;
 		case NETWORK_ACTION_NAME_CHANGE:    strid = STR_NETWORK_NAME_CHANGE; break;
 		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];
 	SetDParamStr(0, name);
 	SetDParamStr(1, str);
 	SetDParam(2, data);

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -605,13 +605,13 @@ public: @@
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
+	{
 		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:
 					/* scroll up by one */
 					if (this->server == NULL) return ES_HANDLED;
 					if (this->list_pos > 0) this->list_pos--;
@@ @@ -639,21 +639,21 @@ public: @@
 					/* jump to end */
 					this->list_pos = this->servers.Length() - 1;
 					break;
 				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) {
 				if (keycode == WKC_DELETE) { // Press 'delete' to remove servers
 					NetworkGameListRemoveItem(this->server);
 					NetworkRebuildHostList();

src/settings.cpp

➞

Show inline comments

@@ @@ -1454,15 +1454,15 @@ const SettingDesc _patch_settings[] = { @@
 	 SDTC_BOOL(gui.bridge_pillars,                       S,  0,  true,                        STR_NULL,                                       NULL),
 	 SDTC_BOOL(gui.auto_euro,                            S,  0,  true,                        STR_NULL,                                       NULL),
 	  SDTC_VAR(gui.news_message_timeout,      SLE_UINT8, S,  0,     2,        1,      255, 0, STR_NULL,                                       NULL),
 	 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),
 	  SDTC_VAR(gui.console_backlog_timeout,  SLE_UINT16, S,  0,   100,       10,    65500, 0, STR_NULL,                                       NULL),
 	  SDTC_VAR(gui.console_backlog_length,   SLE_UINT16, S,  0,   100,       10,    65500, 0, STR_NULL,                                       NULL),
 #ifdef ENABLE_NETWORK

src/table/sprites.h

➞

Show inline comments

@@ @@ -142,13 +142,13 @@ enum Sprites { @@
 	SPR_AQUEDUCT_MIDDLE_Y = SPR_AQUEDUCT_BASE + 5,
 	SPR_AQUEDUCT_PILLAR_X = SPR_AQUEDUCT_BASE + 6,
 	SPR_AQUEDUCT_PILLAR_Y = SPR_AQUEDUCT_BASE + 7,
 	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,
 	TRACKS_FOR_SLOPES_SPRITE_COUNT = 12,
 	SPR_SLOPES_BASE              = SPR_TRACKS_FOR_SLOPES_BASE + TRACKS_FOR_SLOPES_SPRITE_COUNT,

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -1603,13 +1603,13 @@ static inline void SetLastSpeed(Vehicle @@
 /** Mark a train as stuck and stop it if it isn't stopped right now. */
 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;
 		v->subspeed = 0;
 		SetLastSpeed(v, 0);
@@ @@ -4356,13 +4356,13 @@ static void TrainLocoHandler(Vehicle *v, @@
 			/* 192 spd used for going straight, 256 for going diagonally. */
 			adv_spd = (v->direction & 1) ? 192 : 256;
 		} while (j >= adv_spd);
 		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
+}
 Money Train::GetRunningCost() const
+{

src/window.cpp

➞

Show inline comments

@@ @@ -179,13 +179,13 @@ static void DispatchLeftClickEvent(Windo @@
 				case WWT_TEXTBTN | WWB_PUSHBUTTON: /* WWT_PUSHTXTBTN */
 					w->HandleButtonClick(widget);
 					break;
+			}
 		} 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) {
 				const int widget_index = wi - w->widget;
 				qs->OnOpenOSKWindow(widget_index);
+			}

0 comments (0 inline, 0 general)