mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r19132) -Codechange: No need to end a line with ;;.
This commit is contained in:
parent
ac65c41509
commit
33a96b5ef3
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue