summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-18 21:55:09 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-18 21:55:09 -0700
commit69a36c1092c772f05badbab400888712129072ba (patch)
treea2c8ecf8216860c10acb2cb64af4d0660df2c4c3 /src
parentac359e696f162090840dab488a6ef4981d35bbda (diff)
downloadtmwa-69a36c1092c772f05badbab400888712129072ba.tar.gz
tmwa-69a36c1092c772f05badbab400888712129072ba.tar.bz2
tmwa-69a36c1092c772f05badbab400888712129072ba.tar.xz
tmwa-69a36c1092c772f05badbab400888712129072ba.zip
Fix silly bugs in the previous patch
Diffstat (limited to 'src')
-rw-r--r--src/char/char.cpp3
-rw-r--r--src/common/dumb_ptr.hpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index 3fc2b87..cb2fae2 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -1707,7 +1707,10 @@ void parse_frommap(int fd)
for (mmo_charstatus& cdi : char_data)
{
if (cdi.char_id == afi.char_id)
+ {
+ cd = &cdi;
break;
+ }
}
assert (cd && "uh-oh - deleted while in queue?");
afi.delflag = 1;
diff --git a/src/common/dumb_ptr.hpp b/src/common/dumb_ptr.hpp
index 91293c6..9321036 100644
--- a/src/common/dumb_ptr.hpp
+++ b/src/common/dumb_ptr.hpp
@@ -98,6 +98,7 @@ public:
void new_(size_t z)
{
impl = new T[z]();
+ sz = z;
}
static
dumb_ptr<T[]> make(size_t z)