summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-13 05:15:56 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-13 05:15:56 +0000
commit2f31e73831a21d058d0f2227eed5fdeaef1cf15a (patch)
tree2c779f0881cbc635bae18bb852b6400bfad108ce
parentda116e9a6d43bc61e94f5b64e14a1378256a6e24 (diff)
downloadhercules-2f31e73831a21d058d0f2227eed5fdeaef1cf15a.tar.gz
hercules-2f31e73831a21d058d0f2227eed5fdeaef1cf15a.tar.bz2
hercules-2f31e73831a21d058d0f2227eed5fdeaef1cf15a.tar.xz
hercules-2f31e73831a21d058d0f2227eed5fdeaef1cf15a.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@150 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/atcommand.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7659983b1..1e43407c8 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4437,6 +4437,8 @@ static void atcommand_raise_sub(struct map_session_data* sd)
clif_updatestatus(sd, SP_HP);
clif_updatestatus(sd, SP_SP);
clif_resurrection(&sd->bl, 1);
+ if (battle_config.pc_invincible_time > 0)
+ pc_setinvincibletimer(sd, battle_config.pc_invincible_time);
clif_displaymessage(sd->fd, msg_table[63]); // Mercy has been shown.
}
}
@@ -7579,7 +7581,7 @@ atcommand_changesex(
{
// char sex[200], output[200];
- int isex = (sd->status.sex+1)%2;
+// int isex = (sd->status.sex+1)%2;
/*
if (!message || !*message)
return -1;
@@ -7597,7 +7599,7 @@ atcommand_changesex(
}
*/
// if (isex != sd->sex) {
- chrif_changesex(sd->status.account_id, isex);
+ chrif_changesex(sd->status.account_id, ((sd->status.sex+1)%2));
// } else {
// sprintf(output,msg_table[460],(isex == 0)?"female":"male");
// clif_displaymessage(fd,output);