diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-22 22:30:13 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-23 22:07:50 -0700 |
commit | dbbfda0e96037da4f208ff8f00d181a5294484ae (patch) | |
tree | 7a7b9982c6d98ddc2271aade72040ea9233a4a11 /src/map/script.cpp | |
parent | 83db3bbee4e19e7426a32ee89ad6c2d8e48260f2 (diff) | |
download | tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.tar.gz tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.tar.bz2 tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.tar.xz tmwa-dbbfda0e96037da4f208ff8f00d181a5294484ae.zip |
add new stuff stuff (with tests!), poison memcmp and strncpy
Diffstat (limited to 'src/map/script.cpp')
-rw-r--r-- | src/map/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp index 0e95904..8ba2ebc 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -1563,7 +1563,7 @@ void builtin_input(ScriptState *st) sd->state.menu_or_input = 0; if (postfix == '$') { - set_reg(sd, type, num, dumb_string::fake(sd->npc_str)); + set_reg(sd, type, num, dumb_string::fake(sd->npc_str.c_str())); } else { @@ -2795,7 +2795,7 @@ void builtin_announce(ScriptState *st) static void builtin_mapannounce_sub(dumb_ptr<block_list> bl, dumb_string str, int flag) { - clif_GMmessage(bl, str.c_str(), flag | 3); + clif_GMmessage(bl, str, flag | 3); } static |