diff options
| author | MadCamel <madcamel@gmail.com> | 2009-11-08 06:25:42 -0500 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2009-11-08 06:25:42 -0500 |
| commit | 6e42644247e80667db4d39c3a0e543d9476f9c87 (patch) | |
| tree | 483cd44a8e4bd1587b3c1c51e8bad5f9d30da7c8 /src/map/clif.c | |
| parent | 35044714f13629ee6951aaa7a03d409428fdd4e4 (diff) | |
| parent | d90bbe7517fd3bd51d4893cced5f20bcf314e601 (diff) | |
| download | tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.tar.gz tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.tar.bz2 tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.tar.xz tmwa-6e42644247e80667db4d39c3a0e543d9476f9c87.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 7b4720c..c961464 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -777,7 +777,7 @@ static int clif_set0078(struct map_session_data *sd, unsigned char *buf) { WBUFB(buf,45)=sd->sex; WBUFPOS(buf,46,sd->bl.x,sd->bl.y); WBUFB(buf,48)|=sd->dir&0x0f; - WBUFW(buf,49)=pc_isGM(sd) == 60 ? 0x80 : 0; + WBUFW(buf,49)=(pc_isGM(sd) == 60 || pc_isGM(sd) == 99) ? 0x80 : 0; WBUFB(buf,51)=sd->state.dead_sit; WBUFW(buf,52)=((level = battle_get_lv(&sd->bl)) > battle_config.max_lv) ? battle_config.max_lv : level; @@ -6742,8 +6742,8 @@ void clif_parse_Restart(int fd, struct map_session_data *sd) { } break; case 0x01: - if(!pc_isdead(sd) && (sd->opt1 || (sd->opt2 && !(night_flag == 1 && sd->opt2 == STATE_BLIND)))) - return; + /*if(!pc_isdead(sd) && (sd->opt1 || (sd->opt2 && !(night_flag == 1 && sd->opt2 == STATE_BLIND)))) + return;*/ /* Rovert's Prevent logout option - Fixed [Valaris] */ if ((battle_config.prevent_logout && (gettick() - sd->canlog_tick) >= 10000) || (!battle_config.prevent_logout)) { |