diff options
author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-31 09:22:25 +0000 |
---|---|---|
committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-31 09:22:25 +0000 |
commit | b81e57a9a349e06fba2ad56757ea3d08b01db586 (patch) | |
tree | 2d6aa14044c6719b8b204bbb4e8069e8b94417e2 /src/common | |
parent | 794453043edb43f3d5d756c9793e704003df85cc (diff) | |
download | hercules-b81e57a9a349e06fba2ad56757ea3d08b01db586.tar.gz hercules-b81e57a9a349e06fba2ad56757ea3d08b01db586.tar.bz2 hercules-b81e57a9a349e06fba2ad56757ea3d08b01db586.tar.xz hercules-b81e57a9a349e06fba2ad56757ea3d08b01db586.zip |
- Updated getitem and guardian entries in script_commands.txt.
- Fixed getitem trying to get <character ID> from the wrong argument.
- Now getitem can be run on scripts without a player attached if <character ID> is specified.
- Now the two last arguments of guardian are optional and independant of each other ("<event label>" and <guardian index>). This way the previous implementation and script_commands definition are still valid code.
- Now buildin function names and argument definitions are checked for validity before adding the function to the script engine.
Argument definitions follow the pattern:
(v|s|i|l)*\?*\*?
v - value (string or int)
s - string
i - int
l - label
? - one optional parameter
* - unknown number of optional parameters
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9599 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index f8e65fb60..4e25abbb1 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -571,7 +571,7 @@ int WFIFOSET(int fd,int len) if(s->wdata_size+len > s->max_wdata) { // actually there was a buffer overflow already unsigned char *sin_addr = (unsigned char *)&s->client_addr.sin_addr; - ShowFatalError("socket: Buffer Overflow. Connection %d (%d.%d.%d.%d) has written %d byteson a %d/%d bytes buffer.\n", fd, + ShowFatalError("socket: Buffer Overflow. Connection %d (%d.%d.%d.%d) has written %d bytes on a %d/%d bytes buffer.\n", fd, sin_addr[0], sin_addr[1], sin_addr[2], sin_addr[3], len, s->wdata_size, s->max_wdata); ShowDebug("Likely command that caused it: 0x%x\n", (*(unsigned short*)(s->wdata+s->wdata_size))); |