mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: 'Declaration hides variable'

pull/13582/head
Rubidium 2025-02-15 16:03:27 +01:00 committed by rubidium42
parent 443d7ece29
commit 2d30df8110
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/autoreplace_cmd.cpp
View File

@ -666,7 +666,7 @@ static CommandCost ReplaceChain(Vehicle **chain, DoCommandFlags flags, bool wago
* Note: The vehicle attach callback is disabled here :) */ * Note: The vehicle attach callback is disabled here :) */
if (!flags.Test(DoCommandFlag::Execute)) { if (!flags.Test(DoCommandFlag::Execute)) {
/* Separate the head, so we can reattach the old vehicles */ /* Separate the head, so we can reattach the old vehicles */
Train *second = Train::From(old_head)->GetNextUnit(); second = Train::From(old_head)->GetNextUnit();
if (second != nullptr) CmdMoveVehicle(second, nullptr, {DoCommandFlag::Execute, DoCommandFlag::AutoReplace}, true); if (second != nullptr) CmdMoveVehicle(second, nullptr, {DoCommandFlag::Execute, DoCommandFlag::AutoReplace}, true);
assert(Train::From(old_head)->GetNextUnit() == nullptr); assert(Train::From(old_head)->GetNextUnit() == nullptr);

3
src/fileio.cpp
View File

@ -259,8 +259,7 @@ std::optional<FileHandle> FioFOpenFile(const std::string &filename, const char *
/* Resolve ".." */ /* Resolve ".." */
std::istringstream ss(resolved_name); std::istringstream ss(resolved_name);
std::vector<std::string> tokens; std::vector<std::string> tokens;
std::string token; for (std::string token; std::getline(ss, token, PATHSEPCHAR); /* nothing */) {
while (std::getline(ss, token, PATHSEPCHAR)) {
if (token == "..") { if (token == "..") {
if (tokens.size() < 2) return std::nullopt; if (tokens.size() < 2) return std::nullopt;
tokens.pop_back(); tokens.pop_back();

3
src/industry_cmd.cpp
View File

@ -1773,8 +1773,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type,
i->type = type; i->type = type;
auto &industries = Industry::industries[type]; auto &industries = Industry::industries[type];
auto it = std::ranges::lower_bound(industries, i->index); industries.emplace(std::ranges::lower_bound(industries, i->index), i->index);
it = industries.emplace(it, i->index);
for (size_t index = 0; index < std::size(indspec->produced_cargo); ++index) { for (size_t index = 0; index < std::size(indspec->produced_cargo); ++index) {
if (!IsValidCargoType(indspec->produced_cargo[index])) break; if (!IsValidCargoType(indspec->produced_cargo[index])) break;