diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/beingrecv.cpp | 4 | ||||
| -rw-r--r-- | src/net/eathena/playerrecv.cpp | 4 | ||||
| -rw-r--r-- | src/net/tmwa/beingrecv.cpp | 19 |
3 files changed, 4 insertions, 23 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 313c2872b..535f65091 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -1783,10 +1783,6 @@ void BeingRecv::processBeingAttrs(Net::MessageIn &msg) dstBeing != localPlayer) { dstBeing->setGroupId(groupId); - if (groupId != 0) - dstBeing->setGM(true); - else - dstBeing->setGM(false); } dstBeing->setHorse(mount); dstBeing->setLanguageId(language); diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp index d9f85f45b..a85b53c60 100644 --- a/src/net/eathena/playerrecv.cpp +++ b/src/net/eathena/playerrecv.cpp @@ -531,10 +531,6 @@ void PlayerRecv::processPlayerAttrs(Net::MessageIn &msg) return; localPlayer->setGroupId(groupId); - if (groupId > 0) - localPlayer->setGM(true); - else - localPlayer->setGM(false); } void PlayerRecv::processPlayerStatUpdate7(Net::MessageIn &msg) diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index c47b3e2c7..a40bcd1aa 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -64,25 +64,14 @@ namespace TmwAthena static void setGm(Being *const dstBeing, const uint16_t gmstatus) { - if (dstBeing != localPlayer) + if (dstBeing != localPlayer && + gmstatus == 0x80) { - if (gmstatus == 0x80) - { - dstBeing->setGroupId(paths.getIntValue("gmDefaultLevel")); - dstBeing->setGM(true); - } - else - { - dstBeing->setGroupId(gmstatus); - dstBeing->setGM(gmstatus != 0); - } + dstBeing->setGroupId(paths.getIntValue("gmDefaultLevel")); } else { - if (gmstatus != 0) - dstBeing->setGM(true); - else - dstBeing->setGM(false); + dstBeing->setGroupId(gmstatus); } } |