diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-18 16:13:20 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-18 16:13:20 +0000 |
| commit | ee3f834706fcdb2df31987e5731da06946aa1060 (patch) | |
| tree | a0a5b9137b9b010889feaddde075b4afed2ebcd2 /src | |
| parent | ad3c28295537a5d942809ca07cae49bc350c45ab (diff) | |
| download | hercules-ee3f834706fcdb2df31987e5731da06946aa1060.tar.gz hercules-ee3f834706fcdb2df31987e5731da06946aa1060.tar.bz2 hercules-ee3f834706fcdb2df31987e5731da06946aa1060.tar.xz hercules-ee3f834706fcdb2df31987e5731da06946aa1060.zip | |
- setting npc cells will no longer work on non-walkable tiles (since you could do this to override cell types and make unwalkable cells walkable again, for example).
- Small fix in the char-server accept code.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11755 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/char/char.c b/src/char/char.c index 2df5a7318..be2f3dafa 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3254,11 +3254,11 @@ int parse_char(int fd) // request to connect case 0x65: - ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); if (RFIFOREST(fd) < 17) return 0; { int GM_value; + ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); if (sd) { //Received again auth packet for already authentified account?? Discard it. diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 4e3d7382e..04520743a 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -2772,10 +2772,10 @@ int parse_char(int fd) // request to connect case 0x65: - ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); if (RFIFOREST(fd) < 17) return 0; { + ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); if (sd) { //Received again auth packet for already authentified account?? Discard it. //TODO: Perhaps log this as a hack attempt? diff --git a/src/map/npc.c b/src/map/npc.c index 9a6a5ff51..0636bc797 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2544,6 +2544,8 @@ static const char* npc_parse_mapcell(char* w1, char* w2, char* w3, char* w4, con for( x = x0; x <= x1; ++x ) for( y = y0; y <= y1; ++y ) + if (map_getcell(m, x, y, CELL_CHKNOREACH)) + continue; map_setcell(m, x, y, cell); return strchr(start,'\n');// continue |