- Fixed skill problems (who did this? Mercenary skills values are big than homunculus).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13124 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-08-24 16:02:26 +00:00
parent daf7030ce9
commit be66dce771
2 changed files with 7 additions and 7 deletions

View File

@ -30,7 +30,7 @@
#define MAX_ZENY 1000000000 #define MAX_ZENY 1000000000
#define MAX_FAME 1000000000 #define MAX_FAME 1000000000
#define MAX_CART 100 #define MAX_CART 100
#define MAX_SKILL 1040 #define MAX_SKILL 1020
#define GLOBAL_REG_NUM 96 #define GLOBAL_REG_NUM 96
#define ACCOUNT_REG_NUM 64 #define ACCOUNT_REG_NUM 64
#define ACCOUNT_REG2_NUM 16 #define ACCOUNT_REG2_NUM 16

View File

@ -42,10 +42,10 @@
// ranges reserved for mapping skill ids to skilldb offsets // ranges reserved for mapping skill ids to skilldb offsets
#define GD_SKILLRANGEMIN 900 #define GD_SKILLRANGEMIN 900
#define GD_SKILLRANGEMAX GD_SKILLRANGEMIN+MAX_GUILDSKILL #define GD_SKILLRANGEMAX GD_SKILLRANGEMIN+MAX_GUILDSKILL
#define HM_SKILLRANGEMIN 800 #define MC_SKILLRANGEMIN 800
#define HM_SKILLRANGEMAX HM_SKILLRANGEMIN+MAX_HOMUNSKILL
#define MC_SKILLRANGEMIN 700
#define MC_SKILLRANGEMAX MC_SKILLRANGEMIN+MAX_MERCSKILL #define MC_SKILLRANGEMAX MC_SKILLRANGEMIN+MAX_MERCSKILL
#define HM_SKILLRANGEMIN 700
#define HM_SKILLRANGEMAX HM_SKILLRANGEMIN+MAX_HOMUNSKILL
static struct eri *skill_unit_ers = NULL; //For handling skill_unit's [Skotlex] static struct eri *skill_unit_ers = NULL; //For handling skill_unit's [Skotlex]
static struct eri *skill_timer_ers = NULL; //For handling skill_timerskills [Skotlex] static struct eri *skill_timer_ers = NULL; //For handling skill_timerskills [Skotlex]
@ -86,11 +86,11 @@ int skill_get_index( int id )
if( id >= GD_SKILLBASE ) if( id >= GD_SKILLBASE )
id = GD_SKILLRANGEMIN + id - GD_SKILLBASE; id = GD_SKILLRANGEMIN + id - GD_SKILLBASE;
else else
if( id >= HM_SKILLBASE )
id = HM_SKILLRANGEMIN + id - HM_SKILLBASE;
else
if( id >= MC_SKILLBASE ) if( id >= MC_SKILLBASE )
id = MC_SKILLRANGEMIN + id - MC_SKILLBASE; id = MC_SKILLRANGEMIN + id - MC_SKILLBASE;
else
if( id >= HM_SKILLBASE )
id = HM_SKILLRANGEMIN + id - HM_SKILLBASE;
else else
; // identity ; // identity