summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/skill.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2427ed973..d89524bc4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2007/10/10
+ * Fixed a messup in r11347 causing skill units to expire, trigger
+ or not trigger, completely randomly
2007/10/09
* Added upgrade_svn11388.sql to correct some log column widths
* Corrected string lengths according to bugreport:198 [ultramage]
diff --git a/src/map/skill.c b/src/map/skill.c
index 21266e148..b2e20506f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7788,8 +7788,8 @@ int skill_unit_effect (struct block_list* bl, va_list ap)
{
struct skill_unit* unit = va_arg(ap,struct skill_unit*);
struct skill_unit_group* group = unit->group;
- unsigned int flag = va_arg(ap,unsigned int);
unsigned int tick = va_arg(ap,unsigned int);
+ unsigned int flag = va_arg(ap,unsigned int);
int skill_id;
if( !unit->alive || bl->prev == NULL )