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/status.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/status.h') diff --git a/src/map/status.h b/src/map/status.h index 50ed1eb44..a3c03557d 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -579,7 +579,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp,int sp //Define for standard HP/SP damage triggers. #define status_zap(bl, hp, sp) status_damage(NULL, bl, hp, sp, 0, 1) //Define for standard HP/SP skill-related cost triggers (mobs require no HP/SP to use skills) -#define status_charge(bl, hp, sp) (!((bl)->type&BL_CONSUME) || status_damage(NULL, bl, hp, sp, 0, 3)) +int status_charge(struct block_list* bl, int hp, int sp); int status_percent_change(struct block_list *src,struct block_list *target,signed char hp_rate, signed char sp_rate, int flag); //Easier handling of status_percent_change #define status_percent_heal(bl, hp_rate, sp_rate) status_percent_change(NULL, bl, -(hp_rate), -(sp_rate), 1) -- cgit v1.2.3-60-g2f50