From 339ac6c105cc0548328e15adce1f94d7ecddb0bc Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 24 Oct 2007 13:02:00 +0000 Subject: - added defines JOB_MAX_BASIC and JOB_MAX to mmo.h so the code can know which are the max valid classes. - @/#jobchange no longer strip your equipment since pc_jobchange removes any unequippables already. - removed the wasteful define MAX_PC_CLASS and replaced it by the CLASS_COUNT define (which is automatically updated using the previous JOB_MAX* defines) + pc_class2idx function (which converts high class IDs into values that fit in CLASS_COUNT) - Made status_charge a function rather than a define to get rid of those warnings that have been there since forever. - Merged the CELL_NOVENDING code (see topic #129209) - Small check that disables the pet catching process if you try to use another item. - Added a check to fix a warning and prevent a crash in the npc duplicate check (even though I have no idea what this check is supposed to do, therefore I can't fix it properly other than to avoid the crash) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11572 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 87ceb8afb..bbd0363e1 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1463,6 +1463,11 @@ static void npc_parsename(struct npc_data* nd, const char* name, const char* sta char this_mapname[32]; char other_mapname[32]; int i = 0; + + //TODO: the debug message is broken, if nd->exname == NULL + //dnd is left uninitialized, and then is printed as that! + if (*nd->exname == '\0') + dnd = nd; //Dumb anti-crash measure since I am not sure what this piece of code is supposed to do. do { ++i; -- cgit v1.2.3-60-g2f50