summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-10-04 21:03:31 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-10-05 13:42:46 -0700
commit70214054e84b920ca3bea5119bd5d1456c809054 (patch)
tree0a9383d460c8988f788f4ef7adcd567526b35a75 /src/login
parentcaae1e38d0d239f4f7088a64526fe1d2f6587999 (diff)
downloadtmwa-70214054e84b920ca3bea5119bd5d1456c809054.tar.gz
tmwa-70214054e84b920ca3bea5119bd5d1456c809054.tar.bz2
tmwa-70214054e84b920ca3bea5119bd5d1456c809054.tar.xz
tmwa-70214054e84b920ca3bea5119bd5d1456c809054.zip
Remove owning slices
They were hardly ever used, hid errors, and were obsoleted by baseful x'es.
Diffstat (limited to 'src/login')
-rw-r--r--src/login/login.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/login/login.cpp b/src/login/login.cpp
index c029844..679552a 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -17,8 +17,6 @@
#include "../strings/mstring.hpp"
#include "../strings/fstring.hpp"
-#include "../strings/tstring.hpp"
-#include "../strings/sstring.hpp"
#include "../strings/zstring.hpp"
#include "../strings/xstring.hpp"
#include "../strings/vstring.hpp"
@@ -794,7 +792,7 @@ int mmo_auth(struct mmo_account *account, int fd)
&& (account->userid.size() - 2) >= 4 && account->passwd.size() >= 4)
{
new_account_sex = account->userid.back();
- account->userid = stringish<AccountName>(account->userid.orslice_h(2));
+ account->userid = stringish<AccountName>(account->userid.xrslice_h(2));
}
// Strict account search
@@ -3190,8 +3188,8 @@ int login_lan_config_read(ZString lancfgName)
FString line;
while (io::getline(in, line))
{
- SString w1;
- TString w2;
+ XString w1;
+ ZString w2;
if (!split_key_value(line, &w1, &w2))
continue;
@@ -3272,8 +3270,8 @@ int login_config_read(ZString cfgName)
FString line;
while (io::getline(in, line))
{
- SString w1;
- TString w2;
+ XString w1;
+ ZString w2;
if (!split_key_value(line, &w1, &w2))
continue;