diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-19 18:49:42 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-19 18:49:42 +0000 |
commit | d41f7e18f02012ef61df70ee6cc0f3bf1ce14c23 (patch) | |
tree | ae8114bf00136c94aa530b9c9a18365393bd1ebf /src/map/pc.c | |
parent | f4fb6137949da60fc8f2a5cde80a60a1f4760aa2 (diff) | |
download | hercules-d41f7e18f02012ef61df70ee6cc0f3bf1ce14c23.tar.gz hercules-d41f7e18f02012ef61df70ee6cc0f3bf1ce14c23.tar.bz2 hercules-d41f7e18f02012ef61df70ee6cc0f3bf1ce14c23.tar.xz hercules-d41f7e18f02012ef61df70ee6cc0f3bf1ce14c23.zip |
- Modified the targetted skill logic to enable offensive skills to be targetted at party/guild members if the appropiate inf2 value is set.
- Added the SC_JAIL code for timed jailing, but the related @ commands ain't in yet.
- Added checks to make adding items to inventory/cart fail when a char is in finalsave state.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7751 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r-- | src/map/pc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 55be33f6c..15d0d7941 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2522,6 +2522,9 @@ int pc_payzeny(struct map_session_data *sd,int zeny) nullpo_retr(0, sd); + if(sd->state.finalsave) + return 1; + z = (double)sd->status.zeny; if(sd->status.zeny<zeny || z - (double)zeny > MAX_ZENY) return 1; @@ -2589,6 +2592,9 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) nullpo_retr(1, sd); nullpo_retr(1, item_data); + if(sd->state.finalsave) + return 1; + if(item_data->nameid <= 0 || amount <= 0) return 1; if(amount > MAX_AMOUNT) @@ -2927,6 +2933,9 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun nullpo_retr(1, sd); nullpo_retr(1, item_data); + if(sd->state.finalsave) + return 1; + if(item_data->nameid <= 0 || amount <= 0) return 1; data = itemdb_search(item_data->nameid); @@ -2981,6 +2990,9 @@ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type) { nullpo_retr(1, sd); + if(sd->state.finalsave) + return 1; + if(sd->status.cart[n].nameid==0 || sd->status.cart[n].amount<amount) return 1; |