summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/npc.c9
-rw-r--r--src/map/skill.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 53b918b4f..a31fc26c8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/12/31
+ * Added more info when npc_scriptcont tries to continue a different script.
* Refer to http://www.eathena.ws/board/index.php?showtopic=130285
- Renamed pc_checkweighticon to pc_updateweightstatus and cleaned it.
- Updated pc_is50overweight to use battle_config.natural_heal_weight_rate.
diff --git a/src/map/npc.c b/src/map/npc.c
index 9ce3160f6..598cc8ee7 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1110,8 +1110,13 @@ int npc_scriptcont(struct map_session_data *sd,int id)
{
nullpo_retr(1, sd);
- if (id!=sd->npc_id){
- ShowWarning("npc_scriptcont: sd->npc_id (%d) is not id (%d).\n", sd->npc_id, id);
+ if( id != sd->npc_id ){
+ TBL_NPC* nd_sd=(TBL_NPC*)map_id2bl(sd->npc_id);
+ TBL_NPC* nd=(TBL_NPC*)map_id2bl(id);
+ if( nd_sd && nd )
+ ShowWarning("npc_scriptcont: %s (sd->npc_id=%d) is not %s (id=%d).\n", nd_sd->name, sd->npc_id, nd->name, id);
+ else
+ ShowDebug("npc_scriptcont: Invalid npc ID, npc_id variable not cleared? %x (sd->npc_id=%d) is not %x (id=%d)\n", (int)nd_sd, sd->npc_id, (int)nd, id);
return 1;
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 0655990c8..42d826c44 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8461,7 +8461,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
return 0;
}
break;
- case ST_RECOV_WEIGHT_RATE:
+ case ST_RECOV_WEIGHT_RATE://## what is this for and why can battle_config.natural_heal_weight_rate be 101? [FlavioJS]
if(battle_config.natural_heal_weight_rate <= 100 && sd->weight*100/sd->max_weight >= battle_config.natural_heal_weight_rate) {
clif_skill_fail(sd,skill,0,0);
return 0;