summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-29 18:50:08 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-29 18:50:08 +0000
commitf722ebf848436d298e2eac8f6b889d51678be52c (patch)
tree08ba0ebeaaa3bb3b7b3890f5c7cd4508e31a46f3
parentfc558de14f8844cfbe7452413df523e97aa4c0f4 (diff)
downloadhercules-f722ebf848436d298e2eac8f6b889d51678be52c.tar.gz
hercules-f722ebf848436d298e2eac8f6b889d51678be52c.tar.bz2
hercules-f722ebf848436d298e2eac8f6b889d51678be52c.tar.xz
hercules-f722ebf848436d298e2eac8f6b889d51678be52c.zip
- Small change in pc_calc_skilltree which should fix the infinite loop...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6381 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d99fbc789..c3108b1f1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/29
+ * Small change in pc_calc_skilltree which should fix the infinite loop...
+ [Skotlex]
* Added @noask command: enable/disable deals/invites autorejecting.
[LuzZza]
* Removed unreferenced local variable in pc.c [Lance]
diff --git a/src/map/pc.c b/src/map/pc.c
index f5be5add1..a524ca669 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -992,8 +992,8 @@ int pc_calc_skilltree(struct map_session_data *sd)
sd->status.skill[id].id=id;
sd->status.skill[id].lv=1;
sd->status.skill[id].flag=1; //So it is not saved, and tagged as a "bonus" skill.
+ flag=1;
}
- flag=1;
} else if (f){
sd->status.skill[id].id=id;
flag=1;
@@ -2919,7 +2919,7 @@ int pc_show_steal(struct block_list *bl,va_list ap)
//** pc.c:
int pc_steal_item(struct map_session_data *sd,struct block_list *bl)
{
- int i,j,skill,itemid,flag;
+ int i,skill,itemid,flag;
struct mob_data *md;
struct item tmp_item;