summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 14:35:19 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 14:35:19 +0000
commit8d4691495b96e0ad1e6cba84176a82d49a009764 (patch)
tree5b8b4918fd92884c986a8eacf8ddb1229f541faa /src
parent424938aa953e6384f59eb593d6f5f377e007a443 (diff)
downloadhercules-8d4691495b96e0ad1e6cba84176a82d49a009764.tar.gz
hercules-8d4691495b96e0ad1e6cba84176a82d49a009764.tar.bz2
hercules-8d4691495b96e0ad1e6cba84176a82d49a009764.tar.xz
hercules-8d4691495b96e0ad1e6cba84176a82d49a009764.zip
- Reverted the battle_config regen settings from unsigned int to signed int. The battle config reading code can only handle two types of settings: signed ints and unsigned shorts, you'd have to mess up with it if you want to add more types.
- Removed the delayed start effect of Gospel from the code since it should take effect as soon as it's placed down. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8343 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.h6
-rw-r--r--src/map/skill.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 2d4651b65..e78713583 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -197,9 +197,9 @@ extern struct Battle_Config {
unsigned short wedding_modifydisplay;
unsigned short wedding_ignorepalette; //[Skotlex]
unsigned short xmas_ignorepalette; // [Valaris]
- unsigned int natural_healhp_interval;
- unsigned int natural_healsp_interval;
- unsigned int natural_heal_skill_interval;
+ int natural_healhp_interval;
+ int natural_healsp_interval;
+ int natural_heal_skill_interval;
unsigned short natural_heal_weight_rate;
unsigned short item_name_override_grffile;
unsigned short indoors_override_grffile; // [Celest]
diff --git a/src/map/skill.c b/src/map/skill.c
index 33fd6eb89..dfe085f75 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9694,8 +9694,6 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, int count,
group->tick=gettick();
if (skillid == PR_SANCTUARY) //Sanctuary starts healing +1500ms after casted. [Skotlex]
group->tick += 1500;
- else if (skillid == PA_GOSPEL) //Prevent Gospel from triggering bonuses right away. [Skotlex]
- group->tick += interval;
group->valstr=NULL;
i = skill_get_unit_flag(skillid); //Reuse for faster access from here on. [Skotlex]