summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-11-02 15:14:27 -0700
committerBen Longbons <b.r.longbons@gmail.com>2012-11-02 15:14:27 -0700
commit280d3c4a87654ad0468de81e259b8768ea6f9743 (patch)
tree13000129825f75be8662d00ef438ca6332643094
parenta2b835417a4d8689857c4187c9b2f35535e0913e (diff)
parent0a6a05ac62253edfcb23110b97d8126e22f40584 (diff)
downloadtmwa-280d3c4a87654ad0468de81e259b8768ea6f9743.tar.gz
tmwa-280d3c4a87654ad0468de81e259b8768ea6f9743.tar.bz2
tmwa-280d3c4a87654ad0468de81e259b8768ea6f9743.tar.xz
tmwa-280d3c4a87654ad0468de81e259b8768ea6f9743.zip
Merge branch 'master' into test
-rw-r--r--src/map/atcommand.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index c608af5..bca530e 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -8044,7 +8044,7 @@ int atcommand_summon (const int fd, struct map_session_data *sd,
if (!message || !*message)
return -1;
- if (sscanf (message, "%99s", name) < 1)
+ if (sscanf (message, "%99[^\n]", name) < 1)
return -1;
if ((mob_id = atoi (name)) == 0)
@@ -8202,7 +8202,7 @@ atcommand_magic_info (const int fd, struct map_session_data *sd,
memset (character, '\0', sizeof (character));
- if (!message || !*message || sscanf (message, "%99s", character) < 1)
+ if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1)
{
clif_displaymessage (fd, "Usage: @magicinfo <char_name>");
return -1;
@@ -8250,7 +8250,7 @@ atcommand_set_magic (const int fd, struct map_session_data *sd,
memset (character, '\0', sizeof (character));
if (!message || !*message
- || sscanf (message, "%19s %i %99s", magic_type, &value,
+ || sscanf (message, "%19s %i %99[^\n]", magic_type, &value,
character) < 1)
{
clif_displaymessage (fd,
@@ -8425,7 +8425,7 @@ int atcommand_skillpool_info (const int fd, struct map_session_data *sd,
char character[100];
struct map_session_data *pl_sd;
- if (!message || !*message || sscanf (message, "%99s", character) < 1)
+ if (!message || !*message || sscanf (message, "%99[^\n]", character) < 1)
{
clif_displaymessage (fd, "Usage: @sp-info <char_name>");
return -1;