diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-09 03:41:13 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-09 03:41:13 +0000 |
| commit | 5ba9695486983f85847568a3cc204e5ce389af5f (patch) | |
| tree | 730780cf2907b8ad448b92ac2194023965f46719 | |
| parent | f9b917239f808dfb7b901905f6c22a4d7e667d0e (diff) | |
| download | hercules-5ba9695486983f85847568a3cc204e5ce389af5f.tar.gz hercules-5ba9695486983f85847568a3cc204e5ce389af5f.tar.bz2 hercules-5ba9695486983f85847568a3cc204e5ce389af5f.tar.xz hercules-5ba9695486983f85847568a3cc204e5ce389af5f.zip | |
updates
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@521 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 4 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt index a017711dc..64e8f1fc3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Date Added 12/8 + * Fixed @rings [MouseJstr] * Added @marry, @divorce, and @rings [MouseJstr] * fixed @revive [MouseJstr] * Added option to turn off login server logging [celest] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2c547f432..32f0e4bef 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7485,7 +7485,7 @@ atcommand_rings(const int fd, struct map_session_data* sd, const char* command, const char* message) { struct item item_tmp; - int get_count, flag; + int flag; memset(&item_tmp, 0, sizeof(item_tmp)); @@ -7497,7 +7497,7 @@ atcommand_rings(const int fd, struct map_session_data* sd, item_tmp.nameid = 2635; item_tmp.identify = 1; - if ((flag = pc_additem((struct map_session_data*)sd, &item_tmp, get_count))) + if ((flag = pc_additem((struct map_session_data*)sd, &item_tmp, 1))) clif_additem((struct map_session_data*)sd, 0, 0, flag); clif_displaymessage(fd, "You have rings! Give them to the lovers."); diff --git a/src/map/clif.c b/src/map/clif.c index d4f94504c..3143355ca 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10112,10 +10112,10 @@ static int clif_parse(int fd) { } else if (sd) { // not authentified! (refused by char-server or disconnect before to be authentified) printf("Player with account [%d] has logged off your server (not auth account).\n", sd->bl.id); // Player logout display [Yor] map_deliddb(&sd->bl); // account_id has been included in the DB before auth answer + sd = 0; } close(fd); if (sd) // 追加 - map_deliddb(&sd->bl); // 追加 delete_session(fd); return 0; diff --git a/src/map/map.c b/src/map/map.c index 9eb46ed88..11b4a45a8 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -309,7 +309,8 @@ int map_delblock(struct block_list *bl) if(bl->type==BL_PC) map[bl->m].users--; - if(bl->next) bl->next->prev = bl->prev; + if(bl->next) + bl->next->prev = bl->prev; if(bl->prev==&bl_head){ // リストの頭なので、map[]のblock_listを更新する if(bl->type==BL_MOB){ |