summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 03:28:13 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 03:28:13 +0000
commitc7062660486e8636edf6e4079185e774606dcaf1 (patch)
tree58491db231782331ae2014ec09dbfe5fd76f3370
parent671af9a4b431e291b086f8b4381f1f27f2bc2516 (diff)
downloadhercules-c7062660486e8636edf6e4079185e774606dcaf1.tar.gz
hercules-c7062660486e8636edf6e4079185e774606dcaf1.tar.bz2
hercules-c7062660486e8636edf6e4079185e774606dcaf1.tar.xz
hercules-c7062660486e8636edf6e4079185e774606dcaf1.zip
- The picklog will now record negative values for items sold to npcs.
- Added inmediate position and hp-bar update when a character joins a party. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7934 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/npc.c2
-rw-r--r--src/map/party.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0d63d307a..638f4bf8e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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/07/27
+ * The picklog will now record negative values for items sold to npcs.
+ [Skotlex]
+ * Added inmediate position and hp-bar update when a character joins a
+ party. [Skotlex]
* Added missing SC information to NPC_CHANGEUNDEAD [Skotlex]
* Added config setting party_update_interval so you can specify how often
the party-mate minidots should be updated (defaults to 1 sec). [Skotlex]
diff --git a/src/map/npc.c b/src/map/npc.c
index 6f5649654..696775cc2 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1302,7 +1302,7 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list)
}
if(log_config.pick) //Logs items, Sold to NPC (S)hop [Lupus]
- log_pick(sd, "S", 0, nameid, qty, &sd->status.inventory[idx]);
+ log_pick(sd, "S", 0, nameid, -qty, &sd->status.inventory[idx]);
if(nd) {
pc_setreg(sd,add_str("@sold_nameid")+(i<<24),(int)sd->status.inventory[idx].nameid);
diff --git a/src/map/party.c b/src/map/party.c
index dccc1bad7..58de89038 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -341,6 +341,8 @@ int party_member_added(int party_id,int account_id,int char_id, int flag)
sd->status.party_id=party_id;
party_check_conflict(sd);
clif_party_join_info(&p->party,sd);
+ clif_party_hp(sd);
+ clif_party_xy(sd);
clif_charnameupdate(sd); //Update char name's display [Skotlex]
}