updates

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@521 54d463be-8e91-2dee-dedb-b68131a5f0ec

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]

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.");

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) // ’ljÁ
-
 			map_deliddb(&sd->bl); // ’ljÁ
 		delete_session(fd);
 		return 0;

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){