Mercurial > hg > openttd

changeset 14561:c94cddea6802 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19132) -Codechange: No need to end a line with ;;.
author alberth <alberth@openttd.org>
date Sun, 14 Feb 2010 16:31:35 +0000
parents a1a0abe59c8f
children 5ccc732d3142
files src/aircraft_cmd.cpp src/articulated_vehicles.cpp src/base_media_func.h src/blitter/8bpp_simple.cpp src/group_gui.cpp src/network/network.cpp src/network/network_client.cpp src/network/network_gui.cpp src/newgrf_cargo.cpp src/newgrf_gui.cpp src/station_cmd.cpp src/timetable_cmd.cpp src/toolbar_gui.cpp
diffstat 13 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -619,7 +619,7 @@
 	int safe_x = Clamp(x, 0, MapMaxX() * TILE_SIZE);
 	int safe_y = Clamp(y - 1, 0, MapMaxY() * TILE_SIZE);
 	u->x_pos = x;
-	u->y_pos = y - ((v->z_pos - GetSlopeZ(safe_x, safe_y)) >> 3);;
+	u->y_pos = y - ((v->z_pos - GetSlopeZ(safe_x, safe_y)) >> 3);
 
 	safe_y = Clamp(u->y_pos, 0, MapMaxY() * TILE_SIZE);
 	u->z_pos = GetSlopeZ(safe_x, safe_y);
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -170,7 +170,7 @@
 		EngineID artic_engine = GetNextArticPart(i, engine);
 		if (artic_engine == INVALID_ENGINE) break;
 
-		veh_cargos = GetAvailableVehicleCargoTypes(artic_engine, include_initial_cargo_type);;
+		veh_cargos = GetAvailableVehicleCargoTypes(artic_engine, include_initial_cargo_type);
 		*union_mask |= veh_cargos;
 		if (veh_cargos != 0) *intersection_mask &= veh_cargos;
 	}
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -140,7 +140,7 @@
 	bool ret = false;
 	DEBUG(grf, 1, "Checking %s for base " SET_TYPE " set", filename);
 
-	Tbase_set *set = new Tbase_set();;
+	Tbase_set *set = new Tbase_set();
 	IniFile *ini = new IniFile();
 	ini->LoadFromDisk(filename);
 
--- a/src/blitter/8bpp_simple.cpp
+++ b/src/blitter/8bpp_simple.cpp
@@ -57,7 +57,7 @@
 Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
 {
 	Sprite *dest_sprite;
-	dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);;
+	dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);
 
 	dest_sprite->height = sprite->height;
 	dest_sprite->width  = sprite->width;
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -458,7 +458,7 @@
 
 				if (id_g >= this->groups.Length()) return;
 
-				this->group_sel = this->groups[id_g]->index;;
+				this->group_sel = this->groups[id_g]->index;
 
 				this->vehicles.ForceRebuild();
 				this->SetDirty();
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1194,7 +1194,7 @@
 	DEBUG(net, 3, "[core] starting network...");
 
 	/* Network is available */
-	_network_available = NetworkCoreInitialize();;
+	_network_available = NetworkCoreInitialize();
 	_network_dedicated = false;
 	_network_last_advertise_frame = 0;
 	_network_need_advertise = true;
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -598,7 +598,7 @@
 
 	/* First packet, init some stuff */
 	if (maptype == MAP_PACKET_START) {
-		file_pointer = FioFOpenFile("network_client.tmp", "wb", AUTOSAVE_DIR);;
+		file_pointer = FioFOpenFile("network_client.tmp", "wb", AUTOSAVE_DIR);
 		if (file_pointer == NULL) {
 			_switch_mode_errorstr = STR_NETWORK_ERROR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1473,7 +1473,7 @@
 	{
 		switch (widget) {
 			case NLWW_HEADER:
-				size->height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM;;
+				size->height = WD_MATRIX_TOP + FONT_HEIGHT_NORMAL + WD_MATRIX_BOTTOM;
 				break;
 
 			case NLWW_MATRIX:
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -138,5 +138,5 @@
 	}
 
 	/* No matching label was found, so we return the 'climate independent' 'bitnum' */
-	return cs->bitnum;;
+	return cs->bitnum;
 }
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -951,8 +951,8 @@
 					free(c->info);
 
 					c->filename  = f->filename == NULL ? NULL : strdup(f->filename);
-					c->name      = f->name == NULL ? NULL : strdup(f->name);;
-					c->info      = f->info == NULL ? NULL : strdup(f->info);;
+					c->name      = f->name == NULL ? NULL : strdup(f->name);
+					c->info      = f->info == NULL ? NULL : strdup(f->info);
 					c->status    = GCS_UNKNOWN;
 				}
 				break;
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -915,7 +915,7 @@
 	/* Distant join */
 	if (*st == NULL && station_to_join != INVALID_STATION) *st = T::GetIfValid(station_to_join);
 
-	return CommandCost();;
+	return CommandCost();
 }
 
 /**
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -81,7 +81,7 @@
 	int travel_time = order->travel_time;
 	if (packed_time) {
 		travel_time = GB(p2, 0, 16);
-		wait_time   = GB(p2, 16, 16);;
+		wait_time   = GB(p2, 16, 16);
 	} else if (is_journey) {
 		travel_time = GB(p2, 0, 16);
 	} else {
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1615,7 +1615,7 @@
 	_last_built_roadtype = ROADTYPE_ROAD;
 
 	if (_game_mode == GM_EDITOR) {
-		new ScenarioEditorToolbarWindow(&_toolb_scen_desc);;
+		new ScenarioEditorToolbarWindow(&_toolb_scen_desc);
 	} else {
 		new MainToolbarWindow(&_toolb_normal_desc);
 	}