Fix warning: 'T& tmwa::Slice<T>::operator[](size_t) is deprecated

2 files changed, 13 insertions, 9 deletions

diff --git a/src/char/char.cpp b/src/char/char.cpp
index a7f1490..7ffdd0f 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -1040,11 +1040,15 @@ int set_account_reg2(AccountId acc, Slice<GlobalReg> reg)
     {
         if (cd.key.account_id == acc)
         {
-            for (int i = 0; i < num; ++i)
-                cd.data->account_reg2[i] = reg[i];
-            cd.data->account_reg2_num = num;
-            for (int i = num; i < ACCOUNT_REG2_NUM; ++i)
-                cd.data->account_reg2[i] = GlobalReg{};
+            int i = 0;
+            for (const GlobalReg& r : reg)
+                cd.data->account_reg2[i++] = r;
+
+            cd.data->account_reg2_num = i;
+
+            while (i < ACCOUNT_REG2_NUM)
+                cd.data->account_reg2[i++] = GlobalReg{};
+
             c++;
         }
     }
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp
index 76bae8d..f551ec4 100644
--- a/src/map/script-call.cpp
+++ b/src/map/script-call.cpp
@@ -1004,12 +1004,12 @@ int run_script_l(ScriptPointer sp, BlockId rid, BlockId oid,
     st.freeloop = 0;
     st.is_true = 0;
 
-    for (i = 0; i < args.size(); i++)
+    for (const argrec_t& arg : args)
     {
-        if (args[i].name.back() == '$')
-            pc_setregstr(sd, SIR::from(variable_names.intern(args[i].name)), args[i].v.s);
+        if (arg.name.back() == '$')
+            pc_setregstr(sd, SIR::from(variable_names.intern(arg.name)), arg.v.s);
         else
-            pc_setreg(sd, SIR::from(variable_names.intern(args[i].name)), args[i].v.i);
+            pc_setreg(sd, SIR::from(variable_names.intern(arg.name)), arg.v.i);
     }
     run_script_main(&st, rootscript);