diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-26 23:54:44 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-26 23:54:44 +0000 |
| commit | b6164a64d5c67e7db1d375408ce7e3e48ef1f361 (patch) | |
| tree | aa9ea060572398a8d42d80b41291048ada4ad18f /src | |
| parent | 53fd71218c7c5da19c1bd3e77f7aba9add170b9f (diff) | |
| download | hercules-b6164a64d5c67e7db1d375408ce7e3e48ef1f361.tar.gz hercules-b6164a64d5c67e7db1d375408ce7e3e48ef1f361.tar.bz2 hercules-b6164a64d5c67e7db1d375408ce7e3e48ef1f361.tar.xz hercules-b6164a64d5c67e7db1d375408ce7e3e48ef1f361.zip | |
Cleanup
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@800 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 3 | ||||
| -rw-r--r-- | src/map/itemdb.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index acfb5c0ee..225429f11 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7272,7 +7272,8 @@ void clif_parse_WantToConnection(int fd, struct map_session_data *sd) if ((old_sd = map_id2sd(account_id)) != NULL) { clif_authfail_fd(fd, 8); // still recognizes last connection clif_authfail_fd(old_sd->fd, 2); // same id - clif_setwaitclose(sd->fd); // Set session to EOF + if (sd != 0) + clif_setwaitclose(sd->fd); // Set session to EOF } else { sd = session[fd]->session_data = (struct map_session_data*)aCalloc(1, sizeof(struct map_session_data)); sd->fd = fd; diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 566037c6a..ee1e95ac7 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -592,8 +592,8 @@ static int itemdb_read_itemslottable(void) buf[s]=0; for(p=buf;p-buf<s;){ int nameid,equip; - sscanf(p,"%d#%d#",&nameid,&equip); struct item_data* item = itemdb_search(nameid); + sscanf(p,"%d#%d#",&nameid,&equip); if (item && itemdb_isequip2(item)) item->equip=equip; p=strchr(p,10); |