From f9eddde501e494ec25797663282f9f36b22c9f52 Mon Sep 17 00:00:00 2001 From: myT <> Date: Mon, 8 Jan 2024 02:45:08 +0100 Subject: [PATCH] fix: variable shadowing warnings --- UDT_DLL/src/apps/app_demo_cutter.cpp | 6 +++--- UDT_DLL/src/message.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UDT_DLL/src/apps/app_demo_cutter.cpp b/UDT_DLL/src/apps/app_demo_cutter.cpp index 8e83d8d..936d70c 100644 --- a/UDT_DLL/src/apps/app_demo_cutter.cpp +++ b/UDT_DLL/src/apps/app_demo_cutter.cpp @@ -906,7 +906,7 @@ static bool KeepOnlyCuttableDemoFiles(const char* name, u64 /*size*/, void* /*us return HasCuttableDemoFileExtension(name); } -static bool LoadChatConfig(CutByChatConfig& config, const ProgramOptions& options) +static bool LoadChatConfig(CutByChatConfig& config, const ProgramOptions& progOptions) { if(!LoadConfig(config, options.ConfigFilePath)) { @@ -914,8 +914,8 @@ static bool LoadChatConfig(CutByChatConfig& config, const ProgramOptions& option return false; } - if(options.StartOffsetSec > 0) config.StartOffsetSec = (int)options.StartOffsetSec; - if(options.EndOffsetSec > 0) config.EndOffsetSec = (int)options.EndOffsetSec; + if(progOptions.StartOffsetSec > 0) config.StartOffsetSec = (int)progOptions.StartOffsetSec; + if(progOptions.EndOffsetSec > 0) config.EndOffsetSec = (int)progOptions.EndOffsetSec; return true; } diff --git a/UDT_DLL/src/message.cpp b/UDT_DLL/src/message.cpp index ed161e6..61a8ec3 100644 --- a/UDT_DLL/src/message.cpp +++ b/UDT_DLL/src/message.cpp @@ -2175,7 +2175,7 @@ bool udtMessage::RealReadDeltaPlayer(const idPlayerStateBase* from, idPlayerStat if(ReadBit()) { bits = ReadShort(); - for(int i = 0; i < 16; i++) + for(i = 0; i < 16; i++) { if(bits & (1 << i)) { @@ -2191,7 +2191,7 @@ bool udtMessage::RealReadDeltaPlayer(const idPlayerStateBase* from, idPlayerStat if(ReadBit()) { bits = ReadShort(); - for(int i = 0; i < 16; i++) + for(i = 0; i < 16; i++) { if(bits & (1 << i)) {