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/map.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/map/map.c') diff --git a/src/map/map.c b/src/map/map.c index 929ee7c36..43a05810c 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2307,6 +2307,8 @@ int map_getcellp(struct map_data* m,int x,int y,cell_t cellchk) return (type2&CELL_REGEN); case CELL_CHKICEWALL: return (type2&CELL_ICEWALL); + case CELL_CHKNOVENDING: + return (type2&CELL_NOVENDING); default: return 0; } @@ -2336,6 +2338,8 @@ void map_setcell(int m,int x,int y,int cell) case CELL_SETLANDPROTECTOR: map[m].cell[j] |= CELL_LANDPROTECTOR; break; case CELL_CLRLANDPROTECTOR: map[m].cell[j] &= ~CELL_LANDPROTECTOR; break; case CELL_SETREGEN: map[m].cell[j] |= CELL_REGEN; break; + case CELL_SETNOVENDING: map[m].cell[j] |= CELL_NOVENDING; break; + case CELL_CLRNOVENDING: map[m].cell[j] &= ~CELL_NOVENDING; break; default: map[m].gat[j] = cell; break; -- cgit v1.2.3-60-g2f50