diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-30 13:25:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-07-05 02:02:27 +0300 |
| commit | 1a8b776d1df017c6f0753af3604337762781e1f6 (patch) | |
| tree | acde371841b1cd6d4912e8c9082ff67b2757456c | |
| parent | 34731679071a511deccf310603d0f886cacacb94 (diff) | |
| download | hercules-1a8b776d1df017c6f0753af3604337762781e1f6.tar.gz hercules-1a8b776d1df017c6f0753af3604337762781e1f6.tar.bz2 hercules-1a8b776d1df017c6f0753af3604337762781e1f6.tar.xz hercules-1a8b776d1df017c6f0753af3604337762781e1f6.zip | |
Remove useless checks from char server.
| -rw-r--r-- | src/char/int_guild.c | 1 | ||||
| -rw-r--r-- | src/char/int_homun.c | 1 | ||||
| -rw-r--r-- | src/char/int_mail.c | 1 | ||||
| -rw-r--r-- | src/char/inter.c | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 96a78203f..24561fe21 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -882,7 +882,6 @@ int inter_guild_calcinfo(struct guild *g) int mapif_guild_created(int fd, int account_id, struct guild *g) { - nullpo_ret(g); WFIFOHEAD(fd, 10); WFIFOW(fd,0)=0x3830; WFIFOL(fd,2)=account_id; diff --git a/src/char/int_homun.c b/src/char/int_homun.c index 2ec589eaf..eda2afe69 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -54,7 +54,6 @@ void mapif_homunculus_deleted(int fd, int flag) void mapif_homunculus_loaded(int fd, int account_id, struct s_homunculus *hd) { - nullpo_retv(hd); WFIFOHEAD(fd, sizeof(struct s_homunculus)+9); WFIFOW(fd,0) = 0x3891; WFIFOW(fd,2) = sizeof(struct s_homunculus)+9; diff --git a/src/char/int_mail.c b/src/char/int_mail.c index 0d46339e0..d4bfe14e4 100644 --- a/src/char/int_mail.c +++ b/src/char/int_mail.c @@ -459,7 +459,6 @@ void inter_mail_sendmail(int send_id, const char* send_name, int dest_id, const nullpo_retv(dest_name); nullpo_retv(title); nullpo_retv(body); - nullpo_retv(item); memset(&msg, 0, sizeof(struct mail_message)); msg.send_id = send_id; diff --git a/src/char/inter.c b/src/char/inter.c index ca041d581..dbb782093 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -503,7 +503,7 @@ void mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int acc inter->msg_to_fd(map_fd, u_fd, u_aid, "-- Account %d --", account_id); inter->msg_to_fd(map_fd, u_fd, u_aid, "User: %s | GM Group: %d | State: %d", userid, group_id, state); - if (user_pass && *user_pass != '\0') { /* password is only received if your gm level is greater than the one you're searching for */ + if (*user_pass != '\0') { /* password is only received if your gm level is greater than the one you're searching for */ if (pin_code && *pin_code != '\0') inter->msg_to_fd(map_fd, u_fd, u_aid, "Password: %s (PIN:%s)", user_pass, pin_code); else |