mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: do not hide parameters with local variables

This commit is contained in:
rubidium42 2023-01-28 19:07:51 +01:00 committed by rubidium42
parent be0d65d978
commit 1951af07c0
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/squirrel/squirrel/sqstate.cpp vendored
View File

@ -246,9 +246,9 @@ void SQSharedState::DelayFinalFree(SQCollectable *collectable)
if (!this->_collectable_free_processing) { if (!this->_collectable_free_processing) {
this->_collectable_free_processing = true; this->_collectable_free_processing = true;
while (!this->_collectable_free_queue.empty()) { 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(); this->_collectable_free_queue.pop_back();
collectable->FinalFree(); collectable_to_free->FinalFree();
} }
this->_collectable_free_processing = false; this->_collectable_free_processing = false;
} }

10
src/3rdparty/squirrel/squirrel/sqvm.cpp vendored
View File

@ -1064,11 +1064,11 @@ exception_trap:
if(traps) { if(traps) {
do { do {
if(ci->_etraps > 0) { if(ci->_etraps > 0) {
SQExceptionTrap &et = _etraps.top(); SQExceptionTrap &trap = _etraps.top();
ci->_ip = et._ip; ci->_ip = trap._ip;
_top = et._stacksize; _top = trap._stacksize;
_stackbase = et._stackbase; _stackbase = trap._stackbase;
_stack._vals[_stackbase+et._extarget] = currerror; _stack._vals[_stackbase+trap._extarget] = currerror;
_etraps.pop_back(); traps--; ci->_etraps--; _etraps.pop_back(); traps--; ci->_etraps--;
CLEARSTACK(last_top); CLEARSTACK(last_top);
goto exception_restore; goto exception_restore;

6
src/group_cmd.cpp
View File

@ -528,10 +528,10 @@ std::tuple<CommandCost, GroupID> CmdAddVehicleGroup(DoCommandFlag flags, GroupID
if (new_g == NEW_GROUP) { if (new_g == NEW_GROUP) {
/* Create new group. */ /* Create new group. */
auto [ret, group_id] = CmdCreateGroup(flags, v->type, INVALID_GROUP); auto [ret, new_group_id] = CmdCreateGroup(flags, v->type, INVALID_GROUP);
if (ret.Failed()) return { ret, group_id }; if (ret.Failed()) return { ret, new_group_id };
new_g = group_id; new_g = new_group_id;
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

10
src/saveload/saveload.cpp
View File

@ -1923,26 +1923,26 @@ std::vector<SaveLoad> SlTableHeader(const SaveLoadTable &slt)
Debug(sl, _sl.action == SLA_LOAD ? 2 : 6, "Field '{}' of type 0x{:02x} not found, skipping", key, type); Debug(sl, _sl.action == SLA_LOAD ? 2 : 6, "Field '{}' of type 0x{:02x} not found, skipping", key, type);
std::shared_ptr<SaveLoadHandler> handler = nullptr; std::shared_ptr<SaveLoadHandler> handler = nullptr;
SaveLoadType slt; SaveLoadType saveload_type;
switch (type & SLE_FILE_TYPE_MASK) { switch (type & SLE_FILE_TYPE_MASK) {
case SLE_FILE_STRING: case SLE_FILE_STRING:
/* Strings are always marked with SLE_FILE_HAS_LENGTH_FIELD, as they are a list of chars. */ /* 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; break;
case SLE_FILE_STRUCT: 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. */ /* 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<SlSkipHandler>(); handler = std::make_shared<SlSkipHandler>();
break; break;
default: 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; break;
} }
/* We don't know this field, so read to nothing. */ /* 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; continue;
} }