summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-06-26 18:57:16 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-06-26 18:57:16 -0700
commitd4630b8686f2f481c470cf35a2c19128a24344d4 (patch)
tree3847c82378f36ab37713773b61866ec13eb6500b /src/map
parente50964236bd45bf5f8103eff5fbff1c412880365 (diff)
downloadtmwa-d4630b8686f2f481c470cf35a2c19128a24344d4.tar.gz
tmwa-d4630b8686f2f481c470cf35a2c19128a24344d4.tar.bz2
tmwa-d4630b8686f2f481c470cf35a2c19128a24344d4.tar.xz
tmwa-d4630b8686f2f481c470cf35a2c19128a24344d4.zip
Addition is NOT symmetrical, internally
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp
index f719cfe..8957e60 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -4234,9 +4234,9 @@ void op_add(ScriptState *st)
get_val(st, &st->stack->stack_datav.back());
script_data back = st->stack->stack_datav.back();
st->stack->stack_datav.pop_back();
- get_val(st, &st->stack->stack_datav.back());
+
script_data& back1 = st->stack->stack_datav.back();
- st->stack->stack_datav.pop_back();
+ get_val(st, &back1);
if (!(isstr(back) || isstr(back1)))
{
@@ -4246,7 +4246,6 @@ void op_add(ScriptState *st)
{
dumb_string sb = conv_str(st, &back);
dumb_string sb1 = conv_str(st, &back1);
- // ssの予定
std::string buf = sb1.str() + sb.str();
if (back1.type == ByteCode::STR)
back1.u.str.delete_();