Bläddra i källkod

- Updated vc-project files to compile with the new int_homun files.
- Hopefully fixed the crash when using charsave_method = 1


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

skotlex 19 år sedan
förälder
incheckning
b7ef9a3032
5 ändrade filer med 19 tillägg och 3 borttagningar
  1. 3 0
      Changelog-Trunk.txt
  2. 1 3
      src/map/chrif.c
  3. 7 0
      src/map/map.c
  4. 4 0
      vcproj-7.1/char-server_txt.vcproj
  5. 4 0
      vcproj-8/char-server_txt.vcproj

+ 3 - 0
Changelog-Trunk.txt

@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/08/15
+	* Updated vc-project files to compile with the new int_homun files.
+	  [Skotlex]
+	* Hopefully fixed the crash when using charsave_method = 1 [Skotlex]
 	* Moved s_pet structure from map_session_data to pet_data, this enabled the
 	  removal of a few redundant values in the pet_data structure (name, class,
 	  equip) [Skotlex]

+ 1 - 3
src/map/chrif.c

@@ -215,10 +215,8 @@ int chrif_save(struct map_session_data *sd, int flag)
 		charsave_savechar(sd->char_id, &sd->status);
 		if (flag) //Character final saved.
 			sd->state.finalsave = 1;
-		if (flag == 1) {
+		if (flag == 1)
 			chrif_char_offline(sd); //Tell char server that character went offline.
-			map_quit_ack(sd); //Remove from memory.
-		}
 		return 0;	
 	}
 #endif

+ 7 - 0
src/map/map.c

@@ -1706,6 +1706,13 @@ int map_quit(struct map_session_data *sd) {
 		sd->st = NULL;
 		sd->npc_id = 0;
 	}
+#ifndef TXT_ONLY
+	if(charsave_method)
+	{	//Let player be free'd on closing the connection.
+		idb_remove(pc_db,sd->status.account_id);
+		return 0;	
+	}
+#endif
 	if(sd->fd)
   	{	//Player will be free'd on save-ack. [Skotlex]
 		if (session[sd->fd])

+ 4 - 0
vcproj-7.1/char-server_txt.vcproj

@@ -164,6 +164,10 @@
 			<File
 				RelativePath="..\src\char\int_pet.c">
 			</File>
+			<File
+				RelativePath="..\src\char\int_pet.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\char\int_status.c">
 			</File>

+ 4 - 0
vcproj-8/char-server_txt.vcproj

@@ -229,6 +229,10 @@
 				RelativePath="..\src\char\int_pet.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\char\int_homun.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\char\int_status.c"
 				>