summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/pc.c4
3 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 13942be3c..3eabc26a6 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/27
+ * Fixed base-level up @ command giving stat points instead of taking them
+ away when leveling down. [Skotlex
+ * Some small change in pc_heal which would let you have negative SP if you
+ were killed on the same pc_heal invocation. [Skotlex]
* Added 3rd argument to script command 'setmapflag' thx to Jbain [Lupus]
setmapflag "prontera.gat",mf_pvp;
setmapflag "prontera.gat",mf_jexp,100;
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d09db40b9..af87efa99 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2727,7 +2727,7 @@ int atcommand_baselevelup(
level = sd->status.base_level-1;
if (sd->status.status_point > 0) {
for (i = 0; i > -level; i--)
- status_point -= (sd->status.base_level + i + 14) / 5;
+ status_point += (sd->status.base_level + i + 14) / 5;
if (sd->status.status_point < status_point)
sd->status.status_point = 0;
else
diff --git a/src/map/pc.c b/src/map/pc.c
index b39bd4a73..90fc5dfe9 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5126,14 +5126,14 @@ int pc_heal(struct map_session_data *sd,int hp,int sp)
sp = sd->status.max_sp - sd->status.sp;
sd->status.sp+=sp;
+ if(sd->status.sp <= 0)
+ sd->status.sp = 0;
if(sd->status.hp <= 0) {
sd->status.hp = 0;
pc_damage(NULL,sd,1);
hp = 0;
}
- if(sd->status.sp <= 0)
- sd->status.sp = 0;
if(hp)
clif_updatestatus(sd,SP_HP);