소스 검색

Fixed a crash when a castle from [0..MAX-1] wasn't in the db

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9668 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 18 년 전
부모
커밋
aa89a8d655
2개의 변경된 파일14개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 0
      Changelog-Trunk.txt
  2. 12 12
      src/map/guild.c

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/01/18
+	* Fixed a crash when a castle from [0..MAX-1] wasn't in the db [ultramage]
 2007/01/17
 	* Corrected atcommand @homstats so it shows the correct minimum/maximum
 	  possible values.

+ 12 - 12
src/map/guild.c

@@ -1908,18 +1908,18 @@ int guild_agit_break(struct mob_data *md)
 	return 0;
 }
 
-// [MouseJstr]
-//   How many castles does this guild have?
-int guild_checkcastles(struct guild *g) {
-	int i,nb_cas=0, id,cas_id=0;
-	struct guild_castle *gc;
-		id=g->guild_id;
-	for(i=0;i<MAX_GUILDCASTLE;i++){
-		gc=guild_castle_search(i);
-		cas_id=gc->guild_id;
-		if(g->guild_id==cas_id)
-			nb_cas=nb_cas+1;
-		} //end for
+// How many castles does this guild have?
+int guild_checkcastles(struct guild *g)
+{
+	int i, nb_cas = 0;
+	struct guild_castle* gc;
+
+	for(i = 0; i < MAX_GUILDCASTLE; i++) {
+		gc = guild_castle_search(i);
+		if(gc && gc->guild_id == g->guild_id)
+			nb_cas++;
+	}
+
 	return nb_cas;
 }