summaryrefslogtreecommitdiff
path: root/src/map/intif.c
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:43:26 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-09-10 16:43:26 -0700
commit8f4e4e9a92f6af89820a358ab99b990697117502 (patch)
treecb312b5367c71dfe89543a5463be9555177c6445 /src/map/intif.c
parentf841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff)
parent2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff)
downloadtmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz
tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/map/intif.c')
-rw-r--r--src/map/intif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/intif.c b/src/map/intif.c
index 629eade..7069e3a 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -366,7 +366,7 @@ int intif_guild_leave (int guild_id, int account_id, int char_id, int flag,
// ギルドメンバのオンライン状況/Lv更新要求
int intif_guild_memberinfoshort (int guild_id,
int account_id, int char_id, int online,
- int lv, int class)
+ int lv, int class_)
{
WFIFOW (inter_fd, 0) = 0x3035;
WFIFOL (inter_fd, 2) = guild_id;
@@ -374,7 +374,7 @@ int intif_guild_memberinfoshort (int guild_id,
WFIFOL (inter_fd, 10) = char_id;
WFIFOB (inter_fd, 14) = online;
WFIFOW (inter_fd, 15) = lv;
- WFIFOW (inter_fd, 17) = class;
+ WFIFOW (inter_fd, 17) = class_;
WFIFOSET (inter_fd, 19);
return 0;
}
@@ -603,7 +603,7 @@ int mapif_parse_WisToGM (int fd)
message[len - 1] = '\0';
// information is sended to all online GM
for (i = 0; i < fd_max; i++)
- if (session[i] && (pl_sd = session[i]->session_data)
+ if (session[i] && (pl_sd = (struct map_session_data *)session[i]->session_data)
&& pl_sd->state.auth)
if (pc_isGM (pl_sd) >= min_gm_level)
clif_wis_message (i, Wisp_name, message,