From 1951af07c0786551db290c46cc7580a0dd371760 Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Sat, 28 Jan 2023 19:07:51 +0100 Subject: [PATCH] Codechange: do not hide parameters with local variables --- src/3rdparty/squirrel/squirrel/sqstate.cpp | 4 ++-- src/3rdparty/squirrel/squirrel/sqvm.cpp | 10 +++++----- src/group_cmd.cpp | 6 +++--- src/saveload/saveload.cpp | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/3rdparty/squirrel/squirrel/sqstate.cpp b/src/3rdparty/squirrel/squirrel/sqstate.cpp index 6c1c9ec2fb..ce2fdfa55d 100644 --- a/src/3rdparty/squirrel/squirrel/sqstate.cpp +++ b/src/3rdparty/squirrel/squirrel/sqstate.cpp @@ -246,9 +246,9 @@ void SQSharedState::DelayFinalFree(SQCollectable *collectable) if (!this->_collectable_free_processing) { this->_collectable_free_processing = true; while (!this->_collectable_free_queue.empty()) { - SQCollectable *collectable = this->_collectable_free_queue.back(); + SQCollectable *collectable_to_free = this->_collectable_free_queue.back(); this->_collectable_free_queue.pop_back(); - collectable->FinalFree(); + collectable_to_free->FinalFree(); } this->_collectable_free_processing = false; } diff --git a/src/3rdparty/squirrel/squirrel/sqvm.cpp b/src/3rdparty/squirrel/squirrel/sqvm.cpp index fd41212dfb..e643e25984 100644 --- a/src/3rdparty/squirrel/squirrel/sqvm.cpp +++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp @@ -1064,11 +1064,11 @@ exception_trap: if(traps) { do { if(ci->_etraps > 0) { - SQExceptionTrap &et = _etraps.top(); - ci->_ip = et._ip; - _top = et._stacksize; - _stackbase = et._stackbase; - _stack._vals[_stackbase+et._extarget] = currerror; + SQExceptionTrap &trap = _etraps.top(); + ci->_ip = trap._ip; + _top = trap._stacksize; + _stackbase = trap._stackbase; + _stack._vals[_stackbase+trap._extarget] = currerror; _etraps.pop_back(); traps--; ci->_etraps--; CLEARSTACK(last_top); goto exception_restore; diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp index dd8033d4e0..00c7c82b06 100644 --- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -528,10 +528,10 @@ std::tuple CmdAddVehicleGroup(DoCommandFlag flags, GroupID if (new_g == NEW_GROUP) { /* Create new group. */ - auto [ret, group_id] = CmdCreateGroup(flags, v->type, INVALID_GROUP); - if (ret.Failed()) return { ret, group_id }; + auto [ret, new_group_id] = CmdCreateGroup(flags, v->type, INVALID_GROUP); + if (ret.Failed()) return { ret, new_group_id }; - new_g = group_id; + new_g = new_group_id; } if (flags & DC_EXEC) { diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 04e8113820..ebb8e10223 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -1923,26 +1923,26 @@ std::vector SlTableHeader(const SaveLoadTable &slt) Debug(sl, _sl.action == SLA_LOAD ? 2 : 6, "Field '{}' of type 0x{:02x} not found, skipping", key, type); std::shared_ptr handler = nullptr; - SaveLoadType slt; + SaveLoadType saveload_type; switch (type & SLE_FILE_TYPE_MASK) { case SLE_FILE_STRING: /* Strings are always marked with SLE_FILE_HAS_LENGTH_FIELD, as they are a list of chars. */ - slt = SL_STR; + saveload_type = SL_STR; break; case SLE_FILE_STRUCT: /* Structs are always marked with SLE_FILE_HAS_LENGTH_FIELD as SL_STRUCT is seen as a list of 0/1 in length. */ - slt = SL_STRUCTLIST; + saveload_type = SL_STRUCTLIST; handler = std::make_shared(); break; default: - slt = (type & SLE_FILE_HAS_LENGTH_FIELD) ? SL_ARR : SL_VAR; + saveload_type = (type & SLE_FILE_HAS_LENGTH_FIELD) ? SL_ARR : SL_VAR; break; } /* We don't know this field, so read to nothing. */ - saveloads.push_back({key, slt, ((VarType)type & SLE_FILE_TYPE_MASK) | SLE_VAR_NULL, 1, SL_MIN_VERSION, SL_MAX_VERSION, 0, nullptr, 0, handler}); + saveloads.push_back({key, saveload_type, ((VarType)type & SLE_FILE_TYPE_MASK) | SLE_VAR_NULL, 1, SL_MIN_VERSION, SL_MAX_VERSION, 0, nullptr, 0, handler}); continue; }