diff options
| -rw-r--r-- | src/map/npc.c | 8 | ||||
| -rw-r--r-- | src/map/quest.c | 4 | ||||
| -rw-r--r-- | src/map/quest.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 8164054de..a5512eefc 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2598,7 +2598,7 @@ void npc_parse_mob2(struct spawn_data* mob) static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath) { - int num, class_, mode, x,y,xs,ys, i,j; + int num, class_, mode, m,x,y,xs,ys, i,j; char mapname[32]; struct spawn_data mob, *data; struct mob_db* db; @@ -2620,10 +2620,10 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c ShowError("npc_parse_mob: Unknown map '%s' in file '%s', line '%d'.\n", mapname, filepath, strline(buffer,start-buffer)); return strchr(start,'\n');// skip and continue } - mode = map_mapname2mapid(mapname); - if( mode < 0 )//Not loaded on this map-server instance. + m = map_mapname2mapid(mapname); + if( m < 0 )//Not loaded on this map-server instance. return strchr(start,'\n');// skip and continue - mob.m = (unsigned short)mode; + mob.m = (unsigned short)m; if( x < 0 || x >= map[mob.m].xs || y < 0 || y >= map[mob.m].ys ) { diff --git a/src/map/quest.c b/src/map/quest.c index 6e6bdb76c..13b8872eb 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -33,6 +33,10 @@ #include <stdarg.h> #include <time.h> + +struct s_quest_db quest_db[MAX_QUEST_DB]; + + int quest_search_db(int quest_id) { int i; diff --git a/src/map/quest.h b/src/map/quest.h index 94ae57eb5..e0b93fb7e 100644 --- a/src/map/quest.h +++ b/src/map/quest.h @@ -12,7 +12,7 @@ struct s_quest_db { int num_objectives; //char name[NAME_LENGTH]; }; -struct s_quest_db quest_db[MAX_QUEST_DB]; +extern struct s_quest_db quest_db[MAX_QUEST_DB]; typedef enum quest_check_type { HAVEQUEST, PLAYTIME, HUNTING } quest_check_type; diff --git a/src/map/skill.c b/src/map/skill.c index 40fab6b22..864aa3b7d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3441,7 +3441,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break; case SA_QUESTION: case SA_GRAVITY: - case ALL_WEWISH: clif_skill_nodamage(src,bl,skillid,skilllv,1); break; case SA_CLASSCHANGE: @@ -5697,6 +5696,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in skill_castend_nodamage_id); } break; + case ALL_WEWISH: + clif_skill_nodamage(src,bl,skillid,skilllv,1); + break; default: ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skillid); clif_skill_nodamage(src,bl,skillid,skilllv,1); |