Pārlūkot izejas kodu

update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@695 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber 20 gadi atpakaļ
vecāks
revīzija
af1e0b6bee
3 mainītis faili ar 9 papildinājumiem un 1 dzēšanām
  1. 1 0
      Changelog.txt
  2. 6 0
      src/char_sql/char.c
  3. 2 1
      src/map/storage.c

+ 1 - 0
Changelog.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 12/20
+	* Fixed a crash in char.c with new chars [MouseJstr]
 	* Updated npcs_list.txt [Ajarn]
 	* If last_pos.x or .y == 0, set to start point [MouseJstr]
 	* Fixed map loading. If a map was not found, it would remove the next map in the list [Ajarn]

+ 6 - 0
src/char_sql/char.c

@@ -329,6 +329,12 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus *p){
 
 	cp = numdb_search(char_db_,char_id);
 
+	if (cp == NULL) {
+		cp = (struct mmo_charstatus *) malloc(sizeof(struct mmo_charstatus));
+    		memset(cp, 0, sizeof(struct mmo_charstatus));
+		numdb_insert(char_db_, char_id,cp);
+	}
+
 	save_flag = p->char_id;
 	printf("(\033[1;32m%d\033[0m) %s \trequest save char data - ",char_id,char_dat[0].name);
 

+ 2 - 1
src/map/storage.c

@@ -134,6 +134,8 @@ int storage_additem(struct map_session_data *sd,struct storage *stor,struct item
 	nullpo_retr(1, stor);
 	nullpo_retr(1, item_data);
 
+	stor->dirty = 1;
+
 	if(item_data->nameid <= 0 || amount <= 0)
 		return 1;
 	nullpo_retr(1, data = itemdb_search(item_data->nameid));
@@ -172,7 +174,6 @@ int storage_additem(struct map_session_data *sd,struct storage *stor,struct item
 			return 1;
 	}
 
-	stor->dirty = 1;
 	return 0;
 }
 /*==========================================