cpp/openttd-patchpack/source Changeset - r20302:b2b3bcaa28d3

Changeset - r20302:b2b3bcaa28d3

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 11 years ago 2013-06-01 07:44:53
rubidium@openttd.org

(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w

4 files changed:

src/fios.h

src/newgrf.cpp

src/saveload/station_sl.cpp

src/smallmap_gui.cpp

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

src/fios.h

➞

Show inline comments

@@ @@ -169,7 +169,7 @@ const char *FiosBrowseTo(const FiosItem @@
 StringID FiosGetDescText(const char **path, uint64 *total_free);
 bool FiosDelete(const char *name);
 void FiosMakeHeightmapName(char *buf,const char *name, size_t size);
+void FiosMakeHeightmapName(char *buf, const char *name, size_t size);
 void FiosMakeSavegameName(char *buf, const char *name, size_t size);
 FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last);

src/newgrf.cpp

➞

Show inline comments

@@ @@ -3625,7 +3625,7 @@ static ChangeInfoResult AirportChangeInf @@
 							if (att[k].ti.x == 0 && att[k].ti.y == 0x80) {
 								/*  Not the same terminator.  The one we are using is rather
 								 x= -80, y = 0 .  So, adjust it. */
+								 * x = -80, y = 0 .  So, adjust it. */
 								att[k].ti.x = -0x80;
 								att[k].ti.y =  0;
 								att[k].gfx  =  0;

src/saveload/station_sl.cpp

➞

Show inline comments

@@ @@ -244,22 +244,22 @@ static const SaveLoad _station_speclist_ @@
 const SaveLoad *GetGoodsDesc()
+{
 	static const SaveLoad goods_desc[] = {
 		SLEG_CONDVAR(            _waiting_acceptance, SLE_UINT16,                  0, 67),
 		 SLE_CONDVAR(GoodsEntry, acceptance_pickup,   SLE_UINT8,                  68, SL_MAX_VERSION),
 		SLE_CONDNULL(2,                                                           51, 67),
 		     SLE_VAR(GoodsEntry, time_since_pickup,   SLE_UINT8),
 		     SLE_VAR(GoodsEntry, rating,              SLE_UINT8),
 		SLEG_CONDVAR(            _cargo_source,       SLE_FILE_U8 | SLE_VAR_U16,   0, 6),
 		SLEG_CONDVAR(            _cargo_source,       SLE_UINT16,                  7, 67),
 		SLEG_CONDVAR(            _cargo_source_xy,    SLE_UINT32,                 44, 67),
 		SLEG_CONDVAR(            _cargo_days,         SLE_UINT8,                   0, 67),
 		     SLE_VAR(GoodsEntry, last_speed,          SLE_UINT8),
 		     SLE_VAR(GoodsEntry, last_age,            SLE_UINT8),
 		SLEG_CONDVAR(            _cargo_feeder_share, SLE_FILE_U32 | SLE_VAR_I64, 14, 64),
 		SLEG_CONDVAR(            _cargo_feeder_share, SLE_INT64,                  65, 67),
 		 SLE_CONDVAR(GoodsEntry, amount_fract,        SLE_UINT8,                 150, SL_MAX_VERSION),
 		 SLE_CONDLST(GoodsEntry, cargo.packets,       REF_CARGO_PACKET,           68, SL_MAX_VERSION),
 		 SLE_CONDVAR(GoodsEntry, cargo.reserved_count,SLE_UINT,                  181, SL_MAX_VERSION),
 		SLEG_CONDVAR(            _waiting_acceptance,  SLE_UINT16,                  0, 67),
 		 SLE_CONDVAR(GoodsEntry, acceptance_pickup,    SLE_UINT8,                  68, SL_MAX_VERSION),
 		SLE_CONDNULL(2,                                                            51, 67),
 		     SLE_VAR(GoodsEntry, time_since_pickup,    SLE_UINT8),
 		     SLE_VAR(GoodsEntry, rating,               SLE_UINT8),
 		SLEG_CONDVAR(            _cargo_source,        SLE_FILE_U8 | SLE_VAR_U16,   0, 6),
 		SLEG_CONDVAR(            _cargo_source,        SLE_UINT16,                  7, 67),
 		SLEG_CONDVAR(            _cargo_source_xy,     SLE_UINT32,                 44, 67),
 		SLEG_CONDVAR(            _cargo_days,          SLE_UINT8,                   0, 67),
 		     SLE_VAR(GoodsEntry, last_speed,           SLE_UINT8),
 		     SLE_VAR(GoodsEntry, last_age,             SLE_UINT8),
 		SLEG_CONDVAR(            _cargo_feeder_share,  SLE_FILE_U32 | SLE_VAR_I64, 14, 64),
 		SLEG_CONDVAR(            _cargo_feeder_share,  SLE_INT64,                  65, 67),
 		 SLE_CONDVAR(GoodsEntry, amount_fract,         SLE_UINT8,                 150, SL_MAX_VERSION),
 		 SLE_CONDLST(GoodsEntry, cargo.packets,        REF_CARGO_PACKET,           68, SL_MAX_VERSION),
 		 SLE_CONDVAR(GoodsEntry, cargo.reserved_count, SLE_UINT,                  181, SL_MAX_VERSION),
 		SLE_END()
 	};

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -1260,7 +1260,7 @@ inline uint SmallMapWindow::GetNumberRow @@
+{
 	/* Reserve one column for link colours */
 	uint num_rows_linkstats = CeilDiv(_smallmap_cargo_count, columns - 1);
 	uint num_rows_others = CeilDiv(max(_smallmap_industry_count,_smallmap_company_count), columns);
+	uint num_rows_others = CeilDiv(max(_smallmap_industry_count, _smallmap_company_count), columns);
 	return max(this->min_number_of_fixed_rows, max(num_rows_linkstats, num_rows_others));
+}

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)