summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-02 14:27:43 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-02 14:27:43 +0000
commit1d5a07d23c5afe8633469c2da2abbd85a2f18ad2 (patch)
treee35cf149507697bf42a737d664470360b7bf150d
parente1d0bdd2fcdcdb1452d0bf191b427459951e147f (diff)
downloadhercules-1d5a07d23c5afe8633469c2da2abbd85a2f18ad2.tar.gz
hercules-1d5a07d23c5afe8633469c2da2abbd85a2f18ad2.tar.bz2
hercules-1d5a07d23c5afe8633469c2da2abbd85a2f18ad2.tar.xz
hercules-1d5a07d23c5afe8633469c2da2abbd85a2f18ad2.zip
Player shops will not close on death anymore (bugreport:1955).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13036 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 95c3753de..26b0d4f4f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ 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.
+2008/08/02
+ * Player shops will not close on death anymore (bugreport:1955)
2008/08/01
* Removed unused guardian hp columns from the castles table in main.sql.
* Corrected incorrect use of the datetime column in the `login` table. [ultramage]
diff --git a/src/map/pc.c b/src/map/pc.c
index 8eabf3935..d59714e4f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -31,7 +31,6 @@
#include "script.h" // script_config
#include "skill.h"
#include "status.h" // struct status_data
-#include "vending.h" // vending_closevending()
#include "pc.h"
#include "quest.h"
@@ -4902,9 +4901,6 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
int i=0,j=0,k=0;
unsigned int tick = gettick();
- if(sd->vender_id)
- vending_closevending(sd);
-
for(k = 0; k < 5; k++)
if (sd->devotion[k]){
struct map_session_data *devsd = map_id2sd(sd->devotion[k]);