diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
| commit | 8f4e4e9a92f6af89820a358ab99b990697117502 (patch) | |
| tree | cb312b5367c71dfe89543a5463be9555177c6445 /src/map/chrif.c | |
| parent | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff) | |
| parent | 2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff) | |
| download | tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2 tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip | |
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/map/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index b80b4fd..5e2cd4c 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -65,7 +65,7 @@ void chrif_setpasswd (char *pwd) passwd[sizeof(passwd)-1] = '\0'; } -char *chrif_getpasswd () +char *chrif_getpasswd (void) { return passwd; } @@ -651,7 +651,7 @@ int chrif_changedsex (int fd) { if (sd != NULL && sd->status.sex != sex) { - s_class = pc_calc_base_job (sd->status.class); + s_class = pc_calc_base_job (sd->status.pc_class); if (sd->status.sex == 0) { sd->status.sex = 1; @@ -679,10 +679,10 @@ int chrif_changedsex (int fd) // change job if necessary if (s_class.job == 20 || s_class.job == 4021 || s_class.job == 4043) - sd->status.class -= 1; + sd->status.pc_class -= 1; else if (s_class.job == 19 || s_class.job == 4020 || s_class.job == 4042) - sd->status.class += 1; + sd->status.pc_class += 1; } // save character chrif_save (sd); @@ -1257,7 +1257,7 @@ void send_users_tochar (timer_id tid, tick_t tick, custom_id_t id, custom_data_t WFIFOW (char_fd, 0) = 0x2aff; for (i = 0; i < fd_max; i++) { - if (session[i] && (sd = session[i]->session_data) && sd->state.auth && + if (session[i] && (sd = (struct map_session_data *)session[i]->session_data) && sd->state.auth && !((battle_config.hide_GM_session || sd->state.shroud_active || (sd->status.option & OPTION_HIDE)) && pc_isGM (sd))) |