summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/aircraft_cmd.cpp2
-rw-r--r--src/articulated_vehicles.cpp2
-rw-r--r--src/base_media_func.h2
-rw-r--r--src/blitter/8bpp_simple.cpp2
-rw-r--r--src/group_gui.cpp2
-rw-r--r--src/network/network.cpp2
-rw-r--r--src/network/network_client.cpp2
-rw-r--r--src/network/network_gui.cpp2
-rw-r--r--src/newgrf_cargo.cpp2
-rw-r--r--src/newgrf_gui.cpp4
-rw-r--r--src/station_cmd.cpp2
-rw-r--r--src/timetable_cmd.cpp2
-rw-r--r--src/toolbar_gui.cpp2
13 files changed, 14 insertions, 14 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index b6e023823..e5be7fe5b 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -619,7 +619,7 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z)
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);
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index eb20b3b81..47c4f06cf 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -170,7 +170,7 @@ void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type,
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;
}
diff --git a/src/base_media_func.h b/src/base_media_func.h
index bed6e57e9..6a77501c4 100644
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -140,7 +140,7 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length)
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);
diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp
index dc6904b56..a864633f1 100644
--- a/src/blitter/8bpp_simple.cpp
+++ b/src/blitter/8bpp_simple.cpp
@@ -57,7 +57,7 @@ void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoom
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;
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index a510be802..dd8c71747 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -458,7 +458,7 @@ public:
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();
diff --git a/src/network/network.cpp b/src/network/network.cpp
index b4c49914d..2cf12bb61 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1194,7 +1194,7 @@ void NetworkStartUp()
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;
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 09103da78..f20bafab7 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -598,7 +598,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
/* 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;
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index fac8adfba..b15113243 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1473,7 +1473,7 @@ struct NetworkLobbyWindow : public Window {
{
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:
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index e5a762cd4..d0f97c6cd 100644
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -138,5 +138,5 @@ uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile)
}
/* No matching label was found, so we return the 'climate independent' 'bitnum' */
- return cs->bitnum;;
+ return cs->bitnum;
}
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index f88bdcd89..96c3d7bea 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -951,8 +951,8 @@ struct NewGRFWindow : public Window {
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;
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 5ac5b7cac..b08564e7b 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -915,7 +915,7 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station
/* Distant join */
if (*st == NULL && station_to_join != INVALID_STATION) *st = T::GetIfValid(station_to_join);
- return CommandCost();;
+ return CommandCost();
}
/**
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp
index 4cde4b06f..548e3237e 100644
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -81,7 +81,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
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 {
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 41391f963..5d0afdc88 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1615,7 +1615,7 @@ void AllocateToolbar()
_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);
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-04 17:33:08 +0000