diff options
| author | Hello TMW <hello@themanaworld.org> | 2024-09-17 14:04:03 +0000 |
|---|---|---|
| committer | Hello TMW <hello@themanaworld.org> | 2024-09-17 14:04:03 +0000 |
| commit | 3a0bfe045e24a8d769c60b513ade85505926be70 (patch) | |
| tree | 9c8b265ac18c45bf6e51745af32b471646422b26 /src/char | |
| parent | 90754fd121ffaec886c415689031f9ef01ae4972 (diff) | |
| parent | 48ee77e4fdfc3741996df0ddaca49c090292fc10 (diff) | |
| download | tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.tar.gz tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.tar.bz2 tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.tar.xz tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.zip | |
Merge branch tmwa:master into master
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/char.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp index 70ad049..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++; } } @@ -2900,8 +2904,6 @@ int do_init(Slice<ZString> argv) if (!loaded_config_yet) runflag &= load_config_file("conf/tmwa-char.conf"_s, char_::char_confs); - // a newline in the log... - CHAR_LOG(""_fmt); CHAR_LOG("do_init: char-server starting...\n"_fmt); runflag &= lan_check(); |