Fix use of && instead of &

master
Giuseppe Bilotta 2011-08-12 23:34:12 +02:00
parent 835d2e4b5f
commit 72e4c8f523
2 changed files with 5 additions and 5 deletions

View File

@ -185,7 +185,7 @@ void cmd_teleport(std::wostringstream &os,
void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
{
if((ctx->privs && PRIV_BAN) == 0)
if((ctx->privs & PRIV_BAN) == 0)
{
os<<L"-!- You don't have permission to do that";
return;

View File

@ -100,10 +100,10 @@ void Address::Resolve(const char *name)
std::string Address::serializeString()
{
unsigned int a, b, c, d;
a = (m_address && 0xFF000000)>>24;
b = (m_address && 0x00FF0000)>>16;
c = (m_address && 0x0000FF00)>>8;
d = (m_address && 0x000000FF);
a = (m_address & 0xFF000000)>>24;
b = (m_address & 0x00FF0000)>>16;
c = (m_address & 0x0000FF00)>>8;
d = (m_address & 0x000000FF);
return itos(a)+"."+itos(b)+"."+itos(c)+"."+itos(d);
}