summaryrefslogtreecommitdiff
path: root/src/char
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/char
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/char')
-rw-r--r--src/char/char.cpp10
-rw-r--r--src/char/inter.cpp6
2 files changed, 6 insertions, 10 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 35e5841..5d8650e 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -18,8 +18,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"
@@ -2550,8 +2548,8 @@ int 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;
@@ -2623,8 +2621,8 @@ int char_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;
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index b6bc417..b951cc1 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -9,8 +9,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"
@@ -185,8 +183,8 @@ int inter_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;