浏览代码

* Fixed small/big monster spawning crashing (mixed up the merge). [Valaris]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@272 54d463be-8e91-2dee-dedb-b68131a5f0ec
valaris 20 年之前
父节点
当前提交
8cbba34e16
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 1 0
      Changelog.txt
  2. 5 4
      src/map/mob.c

+ 1 - 0
Changelog.txt

@@ -1,5 +1,6 @@
 Date	Added
 11/20
+	* Fixed small/big monster spawning crashing (mixed up the merge). [Valaris]
 	* Fixed crash with upgrading TXT and having more than 256 accounts. [Valaris]
 	* TXT upgrades will convert broken flag to attribute column. [Valaris]
 	* Prevent use of emotion packet to display red mute emote. [Valaris]

+ 5 - 4
src/map/mob.c

@@ -156,10 +156,6 @@ int mob_once_spawn(struct map_session_data *sd,char *mapname,
 	for(count=0;count<amount;count++){
 		md=(struct mob_data *)aCalloc(1,sizeof(struct mob_data));
 		memset(md, '\0', sizeof *md);
-		if(mob_db[class].mode&0x02)
-			md->lootitem=(struct item *)aCalloc(LOOTITEM_SIZE,sizeof(struct item));
-		else
-			md->lootitem=NULL;
 
 		if(class>4000) { // large/tiny mobs [Valaris]
 			md->size=2;
@@ -170,6 +166,11 @@ int mob_once_spawn(struct map_session_data *sd,char *mapname,
 			class-=2000;
 		}
 
+		if(mob_db[class].mode&0x02)
+			md->lootitem=(struct item *)aCalloc(LOOTITEM_SIZE,sizeof(struct item));
+		else
+			md->lootitem=NULL;
+
 		mob_spawn_dataset(md,mobname,class);
 		md->bl.m=m;
 		md->bl.x=x;