summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-14 02:24:49 +0000
committerFate <fate-tmw@googlemail.com>2009-05-14 02:24:49 +0000
commitf5f588157c209bc90f7c9f14ec4ed1403fdd1ee7 (patch)
tree0f2717916a49ae9e0d24ba041482f15c5118a727 /src/map/skill.c
parent92c1c98824efb789709d70ee8d6d5ed6e49b47a3 (diff)
parent94a8a08118ecd9e358d794d430945ada248d0959 (diff)
downloadtmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.tar.gz
tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.tar.bz2
tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.tar.xz
tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.zip
Merge branch 'master' of git@gitorious.org:tmw-eathena/mainline
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 4e5f9de..40eaeaa 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8156,7 +8156,7 @@ int skill_encchant_eremental_end(struct block_list *bl,int type)
*/
int skill_status_change_start(struct block_list *bl, int type, int val1, int val2, int val3, int val4, int tick, int flag)
{
- skill_status_effect(bl, type, val1, val2, val3, val4, tick, flag, 0);
+ return skill_status_effect(bl, type, val1, val2, val3, val4, tick, flag, 0);
}
@@ -9817,7 +9817,7 @@ int skill_unit_move_unit_group( struct skill_unit_group *group, int m,int dx,int
*/
int skill_readdb(void)
{
- int i,j,k,l,m;
+ int i,j,k,l;
FILE *fp;
char line[1024],*p;