diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 18:56:49 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 18:56:49 +0000 |
| commit | 552a4f2ca3c8691a65b254e65c6512e6eb6ddaef (patch) | |
| tree | 725b499b620e7612fab58c96eb4ec30096ab3cce /src/map | |
| parent | 58a012ef888ec1b80c714636f64648ba1e272b18 (diff) | |
| download | hercules-552a4f2ca3c8691a65b254e65c6512e6eb6ddaef.tar.gz hercules-552a4f2ca3c8691a65b254e65c6512e6eb6ddaef.tar.bz2 hercules-552a4f2ca3c8691a65b254e65c6512e6eb6ddaef.tar.xz hercules-552a4f2ca3c8691a65b254e65c6512e6eb6ddaef.zip | |
- Rewrote/cleaned up @petfriendly.
- Cleaned up final part of status_calc_pc (flags 2/4 do not exist)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6857 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 42 | ||||
| -rw-r--r-- | src/map/status.c | 16 |
2 files changed, 15 insertions, 43 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 0b9467dea..f481677cf 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4402,7 +4402,6 @@ int atcommand_petfriendly( const char* command, const char* message)
{
int friendly;
- int t;
nullpo_retr(-1, sd);
if (!message || !*message || (friendly = atoi(message)) < 0) {
@@ -4410,35 +4409,24 @@ int atcommand_petfriendly( return -1;
}
- if (sd->status.pet_id > 0 && sd->pd) {
- if (friendly >= 0 && friendly <= 1000) {
- if (friendly != sd->pet.intimate) {
- t = sd->pet.intimate;
- sd->pet.intimate = friendly;
- clif_send_petstatus(sd);
- if (battle_config.pet_status_support) {
- if ((sd->pet.intimate > 0 && t <= 0) ||
- (sd->pet.intimate <= 0 && t > 0)) {
- if (sd->bl.prev != NULL)
- status_calc_pc(sd, 0);
- else
- status_calc_pc(sd, 2);
- }
- }
- clif_displaymessage(fd, msg_table[182]); // Pet friendly value changed!
- } else {
- clif_displaymessage(fd, msg_table[183]); // Pet friendly is already the good value.
- return -1;
- }
- } else {
- clif_displaymessage(fd, msg_table[37]); // An invalid number was specified.
- return -1;
- }
- } else {
+ if (!sd->pd) {
clif_displaymessage(fd, msg_table[184]); // Sorry, but you have no pet.
return -1;
}
-
+
+ if (friendly < 0 || friendly > 1000)
+ {
+ clif_displaymessage(fd, msg_table[37]); // An invalid number was specified.
+ return -1;
+ }
+
+ if (friendly == sd->pet.intimate) {
+ clif_displaymessage(fd, msg_table[183]); // Pet friendly is already the good value.
+ return -1;
+ }
+ sd->pet.intimate = friendly;
+ clif_send_petstatus(sd);
+ clif_displaymessage(fd, msg_table[182]); // Pet friendly value changed!
return 0;
}
diff --git a/src/map/status.c b/src/map/status.c index 0ef6c3904..6ad8bfa14 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2051,22 +2051,6 @@ int status_calc_pc(struct map_session_data* sd,int first) status = &sd->battle_status; //Need to compare versus this. // ----- CLIENT-SIDE REFRESH ----- - if(first&4) { - calculating = 0; - return 0; - } - if(first&3) { - clif_updatestatus(sd,SP_SPEED); - clif_updatestatus(sd,SP_MAXHP); - clif_updatestatus(sd,SP_MAXSP); - if(first&1) { - clif_updatestatus(sd,SP_HP); - clif_updatestatus(sd,SP_SP); - } - calculating = 0; - return 0; - } - if(memcmp(b_skill,sd->status.skill,sizeof(sd->status.skill))) clif_skillinfoblock(sd); if(b_status.speed != status->speed) |