- Updated the skill_db, some mob skills seem to be better to a range of -9 than 9.

- Corrected the pet_db information for Xmas Goblin and Rice Cake.
- Replaced all struct map_session_data to TBL_PC in script.c
- Pressure no longer vaporizes plants.
- Corrected pc_setregstr to handle a null str argument.
- Corrected @reloadbattleconf causing a add_timer_func "already existing function" error.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10326 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 4 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 59969422f..60fdc0a3b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2637,7 +2637,7 @@ struct Damage  battle_calc_misc_attack(
 
 	if(md.damage < 0)
 		md.damage = 0;
-	else if(md.damage && tstatus->mode&MD_PLANT && skill_num != PA_PRESSURE) //Pressure can vaporize plants
+	else if(md.damage && tstatus->mode&MD_PLANT)
 		md.damage = 1;
 
 	if(!(nk&NK_NO_ELEFIX))
@@ -4324,16 +4324,15 @@ int battle_config_read(const char *cfgName)
 	}
 	fclose(fp);
 
-	if (--count == 0) {
+	if (--count == 0)
 		battle_validate_conf();
-		add_timer_func_list(battle_delay_damage_sub, "battle_delay_damage_sub");
-	}
 
 	return 0;
 }
 
 void do_init_battle(void) {
 	delay_damage_ers = ers_new(sizeof(struct delay_damage));
+	add_timer_func_list(battle_delay_damage_sub, "battle_delay_damage_sub");
 }
 
 void do_final_battle(void) {