diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-14 09:38:44 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-14 09:38:44 +0000 |
| commit | 12d79d7aef72980ea3db22369f2b95f0ed996567 (patch) | |
| tree | fa1693dc5cc14863d37f0a6935b38706f0477260 | |
| parent | fefc60d0a202e489ebc0d999f13a0abcc638518a (diff) | |
| download | hercules-12d79d7aef72980ea3db22369f2b95f0ed996567.tar.gz hercules-12d79d7aef72980ea3db22369f2b95f0ed996567.tar.bz2 hercules-12d79d7aef72980ea3db22369f2b95f0ed996567.tar.xz hercules-12d79d7aef72980ea3db22369f2b95f0ed996567.zip | |
Fixed some guild skill offset calculation mistakes -_-
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11732 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/guild.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 4bf006e5b..84cbe137d 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -72,7 +72,7 @@ static int guild_send_xy_timer(int tid,unsigned int tick,int id,int data); // Modified [Komurka] int guild_skill_get_max (int id) { - if (id < GD_SKILLBASE || id > GD_SKILLBASE+MAX_GUILDSKILL) + if (id < GD_SKILLBASE || id >= GD_SKILLBASE+MAX_GUILDSKILL) return 0; return guild_skill_tree[id-GD_SKILLBASE].max; } diff --git a/src/map/status.c b/src/map/status.c index 9310e1b57..2c9539b28 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -66,7 +66,7 @@ int current_equip_card_id; //To prevent card-stacking (from jA) [Skotlex] static void add_sc(int skill, int sc) { int sk = skill; - if (sk > GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE; + if (sk >= GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE; else if (sk >= HM_SKILLBASE) sk = skill - HM_SKILLBASE + SC_HM_BASE; if (sk < 0 || sk >= MAX_SKILL) { @@ -508,7 +508,7 @@ void initChangeTables(void) int SkillStatusChangeTable(int skill) { int sk = skill; - if (sk > GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE; + if (sk >= GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE; else if (sk >= HM_SKILLBASE) sk = skill - HM_SKILLBASE + SC_HM_BASE; if (sk < 0 || sk >= MAX_SKILL) { |