From a4d6b075c340b703f0595919e1db137b9b916241 Mon Sep 17 00:00:00 2001 From: ultramage Date: Tue, 8 Dec 2009 00:41:29 +0000 Subject: Corrected a variable defined in a header file. 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14190 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/map/npc.c') 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 ) { -- cgit v1.2.3-70-g09d2