summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 16:02:26 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-24 16:02:26 +0000
commit4c54aa497dbee8f68c4f611015b3e28dc7a263d9 (patch)
tree446df62cd9646cbc3f0b1c71f77b7998bccf4bf9 /src
parent81601053b3df92c13a9bc0bd679b49369b2cf788 (diff)
downloadhercules-4c54aa497dbee8f68c4f611015b3e28dc7a263d9.tar.gz
hercules-4c54aa497dbee8f68c4f611015b3e28dc7a263d9.tar.bz2
hercules-4c54aa497dbee8f68c4f611015b3e28dc7a263d9.tar.xz
hercules-4c54aa497dbee8f68c4f611015b3e28dc7a263d9.zip
- Fixed skill problems (who did this? Mercenary skills values are big than homunculus).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13124 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/map/skill.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4d8375cf6..6be0fab19 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -30,7 +30,7 @@
#define MAX_ZENY 1000000000
#define MAX_FAME 1000000000
#define MAX_CART 100
-#define MAX_SKILL 1040
+#define MAX_SKILL 1020
#define GLOBAL_REG_NUM 96
#define ACCOUNT_REG_NUM 64
#define ACCOUNT_REG2_NUM 16
diff --git a/src/map/skill.c b/src/map/skill.c
index 007d91f61..254cb1427 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -42,10 +42,10 @@
// ranges reserved for mapping skill ids to skilldb offsets
#define GD_SKILLRANGEMIN 900
#define GD_SKILLRANGEMAX GD_SKILLRANGEMIN+MAX_GUILDSKILL
-#define HM_SKILLRANGEMIN 800
-#define HM_SKILLRANGEMAX HM_SKILLRANGEMIN+MAX_HOMUNSKILL
-#define MC_SKILLRANGEMIN 700
+#define MC_SKILLRANGEMIN 800
#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_timer_ers = NULL; //For handling skill_timerskills [Skotlex]
@@ -86,12 +86,12 @@ int skill_get_index( int id )
if( id >= GD_SKILLBASE )
id = GD_SKILLRANGEMIN + id - GD_SKILLBASE;
else
- if( id >= HM_SKILLBASE )
- id = HM_SKILLRANGEMIN + id - HM_SKILLBASE;
- else
if( id >= MC_SKILLBASE )
id = MC_SKILLRANGEMIN + id - MC_SKILLBASE;
else
+ if( id >= HM_SKILLBASE )
+ id = HM_SKILLRANGEMIN + id - HM_SKILLBASE;
+ else
; // identity
// validate result