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 | |
| 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')
| -rw-r--r-- | src/common/mapindex.h | 1 | ||||
| -rw-r--r-- | src/common/socket.c | 2 | ||||
| -rw-r--r-- | src/map/atcommand.c | 9 |
3 files changed, 8 insertions, 4 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) { diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 0784dc571..b6895af08 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3316,7 +3316,7 @@ int atcommand_go( { MAP_UMBALA, 89, 157 }, // 12=Umbala { MAP_NIFLHEIM, 21, 153 }, // 13=Niflheim { MAP_LOUYANG, 217, 40 }, // 14=Lou Yang - { "new_zone01.gat", 53, 111 }, // 15=Training Grounds + { MAP_NOVICE, 53, 111 }, // 15=Training Grounds { MAP_JAIL, 23, 61 }, // 16=Prison { MAP_JAWAII, 249, 127 }, // 17=Jawaii { MAP_AYOTHAYA, 151, 117 }, // 18=Ayothaya @@ -3352,7 +3352,8 @@ int atcommand_go( clif_displaymessage(fd, " 12=Umbala 13=Niflheim 14=Lou Yang"); clif_displaymessage(fd, " 15=Novice Grounds 16=Prison 17=Jawaii"); clif_displaymessage(fd, " 18=Ayothaya 19=Einbroch 20=Lighthalzen"); - clif_displaymessage(fd, " 21=Einbech 22=Hugel"); + clif_displaymessage(fd, " 21=Einbech 22=Hugel 23=Rachel"); + clif_displaymessage(fd, " 24=Veins"); return -1; } else { // get possible name of the city and add .gat if not in the name @@ -3423,6 +3424,10 @@ int atcommand_go( town = 21; } else if (strncmp(map_name, "hugel.gat", 3) == 0) { // 3 first characters town = 22; + } else if (strncmp(map_name, "rachel.gat", 3) == 0) { // 3 first characters + town = 23; + } else if (strncmp(map_name, "veins.gat", 3) == 0) { // 3 first characters + town = 24; } if (town >= -3 && town <= -1) { |