summaryrefslogtreecommitdiff
path: root/src/char/char.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-02-07 19:38:32 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-02-07 22:41:23 -0800
commit83b2e0b3ceda907b7186acfcc56c214fc04d9c13 (patch)
treef4dcc8d8b59fd9a633bc2604cc92f0523cc76ee4 /src/char/char.cpp
parentc67c2b7435a13d7ce17b2075e22dc5c6036f702a (diff)
downloadtmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.tar.gz
tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.tar.bz2
tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.tar.xz
tmwa-83b2e0b3ceda907b7186acfcc56c214fc04d9c13.zip
Remove some macros
Diffstat (limited to 'src/char/char.cpp')
-rw-r--r--src/char/char.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp
index a45592d..775ac69 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -1852,10 +1852,8 @@ void parse_frommap(int fd)
if (auth_fifo[i].account_id == RFIFOL(fd, 2) &&
auth_fifo[i].char_id == RFIFOL(fd, 6) &&
auth_fifo[i].login_id1 == RFIFOL(fd, 10) &&
-#if CMP_AUTHFIFO_LOGIN2 != 0
// here, it's the only area where it's possible that we doesn't know login_id2 (map-server asks just after 0x72 packet, that doesn't given the value)
(auth_fifo[i].login_id2 == RFIFOL(fd, 14) || RFIFOL(fd, 14) == 0) && // relate to the versions higher than 18
-#endif
(!check_ip_flag || auth_fifo[i].ip == RFIFOL(fd, 18))
&& !auth_fifo[i].delflag)
{
@@ -2477,9 +2475,7 @@ void parse_char(int fd)
{
if (auth_fifo[i].account_id == sd->account_id &&
auth_fifo[i].login_id1 == sd->login_id1 &&
-#if CMP_AUTHFIFO_LOGIN2 != 0
auth_fifo[i].login_id2 == sd->login_id2 && // relate to the versions higher than 18
-#endif
(!check_ip_flag
|| auth_fifo[i].ip ==
session[fd]->client_addr.sin_addr.s_addr)