summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-17 20:45:06 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-17 20:45:06 +0000
commit0de2cb69ad279d1a1d39c16194522a7a0d3fd41c (patch)
tree9fbd8c3514ebc6dd7519d76e400a450c2d7a1981 /src/map
parentffdd3b0de3532c1bfb8de600270cf863a2902dc8 (diff)
downloadhercules-0de2cb69ad279d1a1d39c16194522a7a0d3fd41c.tar.gz
hercules-0de2cb69ad279d1a1d39c16194522a7a0d3fd41c.tar.bz2
hercules-0de2cb69ad279d1a1d39c16194522a7a0d3fd41c.tar.xz
hercules-0de2cb69ad279d1a1d39c16194522a7a0d3fd41c.zip
added 84 new cards
removed NULLPO warning from my trade.c anti-spoof check. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1246 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/trade.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index 7bb6f77f5..62dd65831 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -76,8 +76,8 @@ void trade_tradeack(struct map_session_data *sd, int type) {
npc_event_dequeue(target_sd);
//close STORAGE window if it's open. It protects from spooffing packets [Lupus]
- nullpo_retv(stor=account2storage2(sd->status.account_id));
- if(stor->storage_status == 1) {
+ stor=account2storage2(sd->status.account_id);
+ if(stor!=NULL && stor->storage_status == 1) {
if (sd->state.storage_flag) //is it Guild Storage or Common
storage_guild_storageclose(sd);
else