diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-04 18:33:53 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-04 18:33:53 +0000 |
| commit | 9d26e6b5088c10b1f565e31b9a273e6ed48cad38 (patch) | |
| tree | c3b4d05273c3364d6ffe685f0bcf811606a2b4dc /src/common | |
| parent | a13a8fdba0ca940376259413f5f48f8ed6e6d354 (diff) | |
| download | hercules-9d26e6b5088c10b1f565e31b9a273e6ed48cad38.tar.gz hercules-9d26e6b5088c10b1f565e31b9a273e6ed48cad38.tar.bz2 hercules-9d26e6b5088c10b1f565e31b9a273e6ed48cad38.tar.xz hercules-9d26e6b5088c10b1f565e31b9a273e6ed48cad38.zip | |
- Updated /doc from jAthena
- Completed adding of the new cities to @go
> that function is ugly and needs a complete rewrite, asap
- Updated thor volcano warps
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9615 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mapindex.h | 1 | ||||
| -rw-r--r-- | src/common/socket.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/common/mapindex.h b/src/common/mapindex.h index b5ca54180..7a0286adf 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -32,6 +32,7 @@ extern char mapindex_cfgfile[80]; #define MAP_RACHEL "rachel.gat" #define MAP_VEINS "veins.gat" #define MAP_JAIL "sec_pri.gat" +#define MAP_NOVICE "new_zone01.gat" unsigned short mapindex_name2id(char*); const char* mapindex_id2name(unsigned short); void mapindex_init(void); diff --git a/src/common/socket.c b/src/common/socket.c index ad33c28db..829bd1a56 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -214,8 +214,6 @@ static int send_from_fifo(int fd) if (len == SOCKET_ERROR) { if (s_errno == S_ECONNABORTED) { ShowWarning("send_from_fifo: Software caused connection abort on session #%d\n", fd); - session[fd]->wdata_size = 0; //Clear the send queue as we can't send anymore. [Skotlex] - set_eof(fd); FD_CLR(fd, &readfds); //Remove the socket so the select() won't hang on it. } if (s_errno != S_EWOULDBLOCK) { |