diff options
author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-24 16:43:26 +0000 |
---|---|---|
committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-24 16:43:26 +0000 |
commit | d8b857ad9db40f4e6345419c8d3659b7914519e7 (patch) | |
tree | 01bc7b8c8dd0e4d89f9061627fbeb2a2fe5a5f53 | |
parent | f410f54a758f597819f271bf5b367a67351311fc (diff) | |
download | hercules-d8b857ad9db40f4e6345419c8d3659b7914519e7.tar.gz hercules-d8b857ad9db40f4e6345419c8d3659b7914519e7.tar.bz2 hercules-d8b857ad9db40f4e6345419c8d3659b7914519e7.tar.xz hercules-d8b857ad9db40f4e6345419c8d3659b7914519e7.zip |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@778 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | Changelog.txt | 4 | ||||
-rw-r--r-- | src/map/atcommand.c | 2 | ||||
-rw-r--r-- | src/map/pc.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Changelog.txt b/Changelog.txt index c71fc54e3..e3a203d4c 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,9 @@ Date Added 12/24 + * @skilltree was looking outside of the particular class + of the char to see if they could do a skill [MouseJstr] + * Fixed a calc_skill_tree bug where too many skills were + visible [MouseJstr] * Added Dev/GDB_reports.txt, take a look in it devs [Ajarn] * Corrected description for player_skill_nofootset and monster_skill_nofootset in battle_athena.conf [celest] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2d1436cfe..f486db422 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7139,7 +7139,7 @@ atcommand_skilltree(const int fd, struct map_session_data* sd, tbl, pc_checkskill(pl_sd, 1)); clif_displaymessage(fd, output); - for (j = 0; j < MAX_SKILL; j++) { + for (j = 0; skill_tree[s][c][j].id != 0; j++) { if (skill_tree[s][c][j].id == skillnum) { skillidx = j; break; diff --git a/src/map/pc.c b/src/map/pc.c index aab6e406b..896a905fb 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -997,8 +997,8 @@ int pc_calc_skilltree(struct map_session_data *sd) c = pc_calc_skilltree_normalize_job(c, sd); for(i=0;i<MAX_SKILL;i++){ - if(skill_get_inf2(i)) - continue; +// if(skill_get_inf2(i) & 0x01) +// continue; if (sd->status.skill[i].flag != 13) sd->status.skill[i].id=0; if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // cardスキルなら、 |