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

Corrected a variable defined in a header file.

Browse Source 
Cleaned up a bad case of variable recycling.
Separated the ALL_WEWISH case from the unrelated sage skill cases (undo of r14183).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14190 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-12-08 00:41:29 +00:00
parent 6f91dfe451
commit e441bae997
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/npc.c
View File

@ -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) 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]; char mapname[32];
struct spawn_data mob, *data; struct spawn_data mob, *data;
struct mob_db* db; 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)); 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 return strchr(start,'\n');// skip and continue
} }
mode = map_mapname2mapid(mapname); m = map_mapname2mapid(mapname);
if( mode < 0 )//Not loaded on this map-server instance. if( m < 0 )//Not loaded on this map-server instance.
return strchr(start,'\n');// skip and continue 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 ) if( x < 0 || x >= map[mob.m].xs || y < 0 || y >= map[mob.m].ys )
{ {

4
src/map/quest.c
View File

@ -33,6 +33,10 @@
#include <stdarg.h> #include <stdarg.h>
#include <time.h> #include <time.h>
struct s_quest_db quest_db[MAX_QUEST_DB];
int quest_search_db(int quest_id) int quest_search_db(int quest_id)
{ {
int i; int i;

2
src/map/quest.h
View File

@ -12,7 +12,7 @@ struct s_quest_db {
int num_objectives; int num_objectives;
//char name[NAME_LENGTH]; //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; typedef enum quest_check_type { HAVEQUEST, PLAYTIME, HUNTING } quest_check_type;

4
src/map/skill.c
View File

@ -3441,7 +3441,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break; break;
case SA_QUESTION: case SA_QUESTION:
case SA_GRAVITY: case SA_GRAVITY:
case ALL_WEWISH:
clif_skill_nodamage(src,bl,skillid,skilllv,1); clif_skill_nodamage(src,bl,skillid,skilllv,1);
break; break;
case SA_CLASSCHANGE: 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); skill_castend_nodamage_id);
} }
break; break;
case ALL_WEWISH:
clif_skill_nodamage(src,bl,skillid,skilllv,1);
break;
default: default:
ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skillid); ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skillid);
clif_skill_nodamage(src,bl,skillid,skilllv,1); clif_skill_nodamage(src,bl,skillid,skilllv,1);