oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Add prefixes to enum values and fix style issues

Browse source
This commit is contained in:
kwolekr 2014-06-28 02:02:38 -04:00
parent 6ee0db6fec
commit c91f8b1d25
6 changed files with 115 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/server.cpp
View file

@ -714,7 +714,7 @@ void Server::AsyncRunStep(bool initial_step)
// If definitions and textures have not been sent, don't
// send objects either
if (client->getState() < DefinitionsSent)
if (client->getState() < CS_DefinitionsSent)
continue;
Player *player = m_env->getPlayer(client->peer_id);
@ -1169,7 +1169,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
std::string playername = "";
PlayerSAO *playersao = NULL;
m_clients.Lock();
RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id,InitDone);
RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_InitDone);
if (client != NULL) {
playername = client->getName();
playersao = emergePlayer(playername.c_str(), peer_id);
@ -1320,10 +1320,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if(datasize < 2+1+PLAYERNAME_SIZE)
return;
RemoteClient* client = getClient(peer_id,Created);
RemoteClient* client = getClient(peer_id, CS_Created);
// If net_proto_version is set, this client has already been handled
if(client->getState() > Created)
if(client->getState() > CS_Created)
{
verbosestream<<"Server: Ignoring multiple TOSERVER_INITs from "
<<addr_s<<" (peer_id="<<peer_id<<")"<<std::endl;
@ -1522,7 +1522,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Enforce user limit.
// Don't enforce for users that have some admin right
if(m_clients.getClientIDs(Created).size() >= g_settings->getU16("max_users") &&
if(m_clients.getClientIDs(CS_Created).size() >= g_settings->getU16("max_users") &&
!checkPriv(playername, "server") &&
!checkPriv(playername, "ban") &&
!checkPriv(playername, "privs") &&
@ -1605,7 +1605,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Send as reliable
m_clients.send(peer_id, 0, reply, true);
m_clients.event(peer_id, Init);
m_clients.event(peer_id, CSE_Init);
}
return;
@ -1617,7 +1617,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
verbosestream<<"Server: Got TOSERVER_INIT2 from "
<<peer_id<<std::endl;
m_clients.event(peer_id, GotInit2);
m_clients.event(peer_id, CSE_GotInit2);
u16 protocol_version = m_clients.getProtocolVersion(peer_id);
@ -1651,7 +1651,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Send node definitions
SendNodeDef(peer_id, m_nodedef, protocol_version);
m_clients.event(peer_id, SetDefinitionsSent);
m_clients.event(peer_id, CSE_SetDefinitionsSent);
// Send media announcement
sendMediaAnnouncement(peer_id);
@ -1666,7 +1666,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
///// begin compatibility code
if (protocol_version <= 22) {
m_clients.event(peer_id, SetClientReady);
m_clients.event(peer_id, CSE_SetClientReady);
m_script->on_joinplayer(playersao);
}
///// end compatibility code
@ -1681,8 +1681,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
return;
}
u8 peer_ser_ver = getClient(peer_id,InitDone)->serialization_version;
u16 peer_proto_ver = getClient(peer_id,InitDone)->net_proto_version;
u8 peer_ser_ver = getClient(peer_id, CS_InitDone)->serialization_version;
u16 peer_proto_ver = getClient(peer_id, CS_InitDone)->net_proto_version;
if(peer_ser_ver == SER_FMT_VER_INVALID)
{
@ -1746,7 +1746,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
data[2], data[3], data[4],
std::string((char*) &data[8],(u16) data[6]));
m_clients.event(peer_id, SetClientReady);
m_clients.event(peer_id, CSE_SetClientReady);
m_script->on_joinplayer(playersao);
}
@ -1778,7 +1778,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
return;
}
if (m_clients.getClientState(peer_id) < Active)
if (m_clients.getClientState(peer_id) < CS_Active)
{
if (command == TOSERVER_PLAYERPOS) return;
@ -2837,7 +2837,7 @@ void Server::deletingPeer(con::Peer *peer, bool timeout)
verbosestream<<"Server::deletingPeer(): peer->id="
<<peer->id<<", timeout="<<timeout<<std::endl;
m_clients.event(peer->id,Disconnect);
m_clients.event(peer->id, CSE_Disconnect);
con::PeerChange c;
c.type = con::PEER_REMOVED;
c.peer_id = peer->id;
@ -2866,12 +2866,12 @@ bool Server::getClientInfo(
{
*state = m_clients.getClientState(peer_id);
m_clients.Lock();
RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id,Invalid);
RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_Invalid);
if (client == NULL) {
m_clients.Unlock();
return false;
}
}
*uptime = client->uptime();
*ser_vers = client->serialization_version;
@ -3841,7 +3841,7 @@ void Server::SendBlocks(float dtime)
i = clients.begin();
i != clients.end(); ++i)
{
RemoteClient *client = m_clients.lockedGetClientNoEx(*i,Active);
RemoteClient *client = m_clients.lockedGetClientNoEx(*i, CS_Active);
if (client == NULL)
return;
@ -3877,7 +3877,7 @@ void Server::SendBlocks(float dtime)
continue;
}
RemoteClient *client = m_clients.lockedGetClientNoEx(q.peer_id,Active);
RemoteClient *client = m_clients.lockedGetClientNoEx(q.peer_id, CS_Active);
if(!client)
continue;
@ -4268,7 +4268,7 @@ void Server::DenyAccess(u16 peer_id, const std::wstring &reason)
DSTACK(__FUNCTION_NAME);
SendAccessDenied(peer_id, reason);
m_clients.event(peer_id,SetDenied);
m_clients.event(peer_id, CSE_SetDenied);
m_con.DisconnectPeer(peer_id);
}