- 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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/map/map.h b/src/map/map.h
index b0f823d8e..896af5507 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -28,10 +28,6 @@
 //  but is not the official behaviour.
 //#define CIRCULAR_AREA
 
-#define MAX_PC_CLASS 4050
-#define PC_CLASS_BASE 0
-#define PC_CLASS_BASE2 (PC_CLASS_BASE + 4001)
-#define PC_CLASS_BASE3 (PC_CLASS_BASE2 + 22)
 #define MAX_NPC_PER_MAP 512
 #define BLOCK_SIZE 8
 #define AREA_SIZE battle_config.area_size
@@ -1219,6 +1215,7 @@ enum _look {
 #define CELL_SAFETYWALL	0x8
 #define CELL_LANDPROTECTOR	0x10
 #define CELL_BASILICA	0x20
+#define CELL_NOVENDING	0x40
 #define CELL_ICEWALL	0x80
 /*
  * map_getcell()で使用されるフラグ
@@ -1241,6 +1238,7 @@ typedef enum {
 	CELL_CHKLANDPROTECTOR,
 	CELL_CHKICEWALL,
 	CELL_CHKSTACK,
+	CELL_CHKNOVENDING,
 } cell_t;
 // map_setcell()で使用されるフラグ
 enum {
@@ -1257,6 +1255,8 @@ enum {
 	CELL_CLRSAFETYWALL,
 	CELL_SETICEWALL,
 	CELL_CLRICEWALL,
+	CELL_SETNOVENDING,
+	CELL_CLRNOVENDING,
 };
 
 extern struct map_data map[];