Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@8343 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-08-18 14:35:19 +00:00
parent 64b38ba4b7
commit c3baf09f47
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/battle.h
View File

@ -197,9 +197,9 @@ extern struct Battle_Config {
unsigned short wedding_modifydisplay; unsigned short wedding_modifydisplay;
unsigned short wedding_ignorepalette; //[Skotlex] unsigned short wedding_ignorepalette; //[Skotlex]
unsigned short xmas_ignorepalette; // [Valaris] unsigned short xmas_ignorepalette; // [Valaris]
unsigned int natural_healhp_interval; int natural_healhp_interval;
unsigned int natural_healsp_interval; int natural_healsp_interval;
unsigned int natural_heal_skill_interval; int natural_heal_skill_interval;
unsigned short natural_heal_weight_rate; unsigned short natural_heal_weight_rate;
unsigned short item_name_override_grffile; unsigned short item_name_override_grffile;
unsigned short indoors_override_grffile; // [Celest] unsigned short indoors_override_grffile; // [Celest]

2
src/map/skill.c
View File

@ -9694,8 +9694,6 @@ struct skill_unit_group *skill_initunitgroup (struct block_list *src, int count,
group->tick=gettick(); group->tick=gettick();
if (skillid == PR_SANCTUARY) //Sanctuary starts healing +1500ms after casted. [Skotlex] if (skillid == PR_SANCTUARY) //Sanctuary starts healing +1500ms after casted. [Skotlex]
group->tick += 1500; group->tick += 1500;
else if (skillid == PA_GOSPEL) //Prevent Gospel from triggering bonuses right away. [Skotlex]
group->tick += interval;
group->valstr=NULL; group->valstr=NULL;
i = skill_get_unit_flag(skillid); //Reuse for faster access from here on. [Skotlex] i = skill_get_unit_flag(skillid); //Reuse for faster access from here on. [Skotlex]