Просмотр исходного кода

- removed 'skill_fail' message when a ground skill fails as that caues double 'skill failed' messages in several instances.
- Corrected shop freeing using free instead of aFree ,causing memory leak reports.
- Corrected the sc def settings modifying tick_def in regards to sc_def instead of tick_def


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

skotlex 17 лет назад
Родитель
Сommit
53d5219da6
4 измененных файлов с 5 добавлено и 9 удалено
  1. 1 1
      src/map/npc.c
  2. 1 5
      src/map/skill.c
  3. 2 2
      src/map/status.c
  4. 1 1
      src/map/unit.c

+ 1 - 1
src/map/npc.c

@@ -1300,7 +1300,7 @@ int npc_unload(struct npc_data* nd)
 #endif
 
 	if( nd->bl.subtype == SHOP )
-		free(nd->u.shop.shop_item);
+		aFree(nd->u.shop.shop_item);
 	else
 	if( nd->bl.subtype == SCRIPT )
 	{

+ 1 - 5
src/map/skill.c

@@ -5487,12 +5487,8 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data)
 
 	ud->canact_tick = tick;
 	ud->skillid = ud->skilllv = 0;
-	if(sd) {
-		clif_skill_fail(sd,ud->skillid,0,0);
+	if(sd)
 		sd->skillitem = sd->skillitemlv = 0;
-	}
-	else if (hd && hd->master)
-		clif_skill_fail(hd->master, ud->skillid, 0, 0);
 	else if(md)
 		md->skillidx  = -1;
 	return 0;

+ 2 - 2
src/map/status.c

@@ -4519,7 +4519,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti
 
 		if (tick_def) {
 			if (battle_config.pc_sc_def_rate != 100)
-				tick_def = sc_def*battle_config.pc_sc_def_rate/100;
+				tick_def = tick_def*battle_config.pc_sc_def_rate/100;
 		}
 
 	} else {
@@ -4535,7 +4535,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti
 
 		if (tick_def) {
 			if (battle_config.mob_sc_def_rate != 100)
-				tick_def = sc_def*battle_config.mob_sc_def_rate/100;
+				tick_def = tick_def*battle_config.mob_sc_def_rate/100;
 		}
 	}
 	

+ 1 - 1
src/map/unit.c

@@ -1816,7 +1816,7 @@ int unit_free(struct block_list *bl, int clrtype)
 		clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 0);
 		party_send_logout(sd);
 		guild_send_memberinfoshort(sd,0);
-		pc_cleareventtimer(sd);		
+		pc_cleareventtimer(sd);
 		pc_delspiritball(sd,sd->spiritball,1);
 		if (clrtype >= 0) {
 			chrif_save_scdata(sd); //Save status changes, then clear'em out from memory. [Skotlex]