summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-06 09:00:18 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-06 09:00:18 +0000
commitb1a8b920af2b39f546cd3408af893741fc94e12b (patch)
treedf3f463a7b0b48bec7d366e7564461f1e224ad27 /src/map/status.c
parentcb2bb1dc2f9b4efc8925542c6162adcedac9c0b1 (diff)
downloadhercules-b1a8b920af2b39f546cd3408af893741fc94e12b.tar.gz
hercules-b1a8b920af2b39f546cd3408af893741fc94e12b.tar.bz2
hercules-b1a8b920af2b39f546cd3408af893741fc94e12b.tar.xz
hercules-b1a8b920af2b39f546cd3408af893741fc94e12b.zip
* Skip partner checking when calculating status with Marionette Control on
* Fixed plagiarised skills become unuseable after saving character * Fixed double skill fail messages for stone curse * Added modulus by zero check to rand() git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1419 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 4418543de..3b910c004 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -779,15 +779,16 @@ int status_calc_pc(struct map_session_data* sd,int first)
sd->paramb[5]+= 5;
}
if(sd->sc_data[SC_MARIONETTE].timer!=-1){
- struct map_session_data *psd = map_id2sd(sd->sc_data[SC_MARIONETTE2].val3);
- if (psd) { // if partner is found
+ // skip partner checking -- should be handled in status_change_timer
+ //struct map_session_data *psd = map_id2sd(sd->sc_data[SC_MARIONETTE2].val3);
+ //if (psd) { // if partner is found
sd->paramb[0]-= sd->status.str/2; // bonuses not included
sd->paramb[1]-= sd->status.agi/2;
sd->paramb[2]-= sd->status.vit/2;
sd->paramb[3]-= sd->status.int_/2;
sd->paramb[4]-= sd->status.dex/2;
sd->paramb[5]-= sd->status.luk/2;
- }
+ //}
}
else if(sd->sc_data[SC_MARIONETTE2].timer!=-1){
struct map_session_data *psd = map_id2sd(sd->sc_data[SC_MARIONETTE2].val3);