diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-05-24 20:13:21 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-24 20:13:21 +0300 |
| commit | 12ca835e1404a6c9750a17d327a7d8bd97bafcb4 (patch) | |
| tree | c016e41b3177610b5433f4eba2e91350537f8cba /src/player.cpp | |
| parent | 0c5f58036531e85ab4c0c7d9ad75466c74aaafe7 (diff) | |
| parent | c5e583e059bc31c0dc57496b23f5c97db1f5a3e3 (diff) | |
| download | dragonfireclient-12ca835e1404a6c9750a17d327a7d8bd97bafcb4.tar.xz | |
Merged CiaranG's fence and fixed two things
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/player.cpp b/src/player.cpp index 12f18de75..147b6c97a 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -36,6 +36,8 @@ std::wstring privsToString(u64 privs) os<<L"settime,"; if(privs & PRIV_PRIVS) os<<L"privs,"; + if(privs & PRIV_SHOUT) + os<<L"shout,"; if(os.tellp()) { // Drop the trailing comma. (Why on earth can't @@ -65,6 +67,8 @@ u64 stringToPrivs(std::wstring str) privs |= PRIV_SETTIME; else if(*i == L"privs") privs |= PRIV_PRIVS; + else if(*i == L"shout") + privs |= PRIV_SHOUT; else return PRIV_INVALID; } |