summaryrefslogtreecommitdiff
path: root/src/map/chrif.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-23 15:14:29 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-23 19:12:48 -0700
commit87218e07b2bc89593eae1cb4abe859cd1a7eaa0f (patch)
tree9343c393ddebf50086fdef8f2a4668781e4afd66 /src/map/chrif.cpp
parent543e4b419239f37321bc5a224d56773d1fe6ebfe (diff)
downloadtmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.gz
tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.bz2
tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.tar.xz
tmwa-87218e07b2bc89593eae1cb4abe859cd1a7eaa0f.zip
Make block_list a base class
Diffstat (limited to 'src/map/chrif.cpp')
-rw-r--r--src/map/chrif.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index a015b3c..51736e4 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -108,7 +108,7 @@ int chrif_save(struct map_session_data *sd)
WFIFOW(char_fd, 0) = 0x2b01;
WFIFOW(char_fd, 2) = sizeof(sd->status) + 12;
- WFIFOL(char_fd, 4) = sd->bl.bl_id;
+ WFIFOL(char_fd, 4) = sd->bl_id;
WFIFOL(char_fd, 8) = sd->char_id;
memcpy(WFIFOP(char_fd, 12), &sd->status, sizeof(sd->status));
WFIFOSET(char_fd, WFIFOW(char_fd, 2));
@@ -206,7 +206,7 @@ int chrif_changemapserver(struct map_session_data *sd, char *name, int x,
}
WFIFOW(char_fd, 0) = 0x2b05;
- WFIFOL(char_fd, 2) = sd->bl.bl_id;
+ WFIFOL(char_fd, 2) = sd->bl_id;
WFIFOL(char_fd, 6) = sd->login_id1;
WFIFOL(char_fd, 10) = sd->login_id2;
WFIFOL(char_fd, 14) = sd->status.char_id;
@@ -306,14 +306,14 @@ int chrif_authreq(struct map_session_data *sd)
nullpo_retr(-1, sd);
- if (!sd || !char_fd || !sd->bl.bl_id || !sd->login_id1)
+ if (!sd || !char_fd || !sd->bl_id || !sd->login_id1)
return -1;
for (i = 0; i < fd_max; i++)
if (session[i] && session[i]->session_data.get() == sd)
{
WFIFOW(char_fd, 0) = 0x2afc;
- WFIFOL(char_fd, 2) = sd->bl.bl_id;
+ WFIFOL(char_fd, 2) = sd->bl_id;
WFIFOL(char_fd, 6) = sd->char_id;
WFIFOL(char_fd, 10) = sd->login_id1;
WFIFOL(char_fd, 14) = sd->login_id2;
@@ -335,7 +335,7 @@ int chrif_charselectreq(struct map_session_data *sd)
nullpo_retr(-1, sd);
- if (!sd || !char_fd || !sd->bl.bl_id || !sd->login_id1)
+ if (!sd || !char_fd || !sd->bl_id || !sd->login_id1)
return -1;
s_ip = 0;
@@ -347,7 +347,7 @@ int chrif_charselectreq(struct map_session_data *sd)
}
WFIFOW(char_fd, 0) = 0x2b02;
- WFIFOL(char_fd, 2) = sd->bl.bl_id;
+ WFIFOL(char_fd, 2) = sd->bl_id;
WFIFOL(char_fd, 6) = sd->login_id1;
WFIFOL(char_fd, 10) = sd->login_id2;
WFIFOL(char_fd, 14) = s_ip;
@@ -696,7 +696,7 @@ int chrif_saveaccountreg2(struct map_session_data *sd)
}
WFIFOW(char_fd, 0) = 0x2b10;
WFIFOW(char_fd, 2) = p;
- WFIFOL(char_fd, 4) = sd->bl.bl_id;
+ WFIFOL(char_fd, 4) = sd->bl_id;
WFIFOSET(char_fd, p);
return 0;