Skip to content

Commit

Permalink
Modernize code: very last fixes (#6290)
Browse files Browse the repository at this point in the history 
Last modernization fixes
  • Loading branch information
@nerzhul
nerzhul committed Aug 20, 2017
1 parent c8d3d11 commit ae9b5e0
Show file tree
Hide file tree
Showing 31 changed files with 430 additions and 525 deletions.
4 changes: 3 additions & 1 deletion src/cavegen.cpp
View file
Expand Up @@ -104,7 +104,9 @@ void CavesNoiseIntersection::generateCaves(MMVManip *vm,
c == biome->c_water) {
column_is_open = true;
continue;
} else if (c == biome->c_river_water) {
}

if (c == biome->c_river_water) {
column_is_open = true;
is_under_river = true;
continue;
Expand Down
55 changes: 22 additions & 33 deletions src/clientiface.cpp
View file
Expand Up @@ -280,12 +280,11 @@ void RemoteClient::GetNextBlocks (

// Block is dummy if data doesn't exist.
// It means it has been not found from disk and not generated
if(block->isDummy())
{
if (block->isDummy()) {
surely_not_found_on_disk = true;
}

if(block->isGenerated() == false)
if (!block->isGenerated())
block_is_invalid = true;

/*
Expand All @@ -295,9 +294,8 @@ void RemoteClient::GetNextBlocks (
Block is near ground level if night-time mesh
differs from day-time mesh.
*/
if(d >= d_opt)
{
if(block->getDayNightDiff() == false)
if (d >= d_opt) {
if (!block->getDayNightDiff())
continue;
}

Expand All @@ -311,8 +309,7 @@ void RemoteClient::GetNextBlocks (
If block has been marked to not exist on disk (dummy)
and generating new ones is not wanted, skip block.
*/
if(generate == false && surely_not_found_on_disk == true)
{
if (!generate && surely_not_found_on_disk) {
// get next one.
continue;
}
Expand Down Expand Up @@ -413,11 +410,8 @@ void RemoteClient::SetBlocksNotSent(std::map<v3s16, MapBlock*> &blocks)
m_nearest_unsent_d = 0;
m_nothing_to_send_pause_timer = 0;

for(std::map<v3s16, MapBlock*>::iterator
i = blocks.begin();
i != blocks.end(); ++i)
{
v3s16 p = i->first;
for (auto &block : blocks) {
v3s16 p = block.first;
m_blocks_modified.insert(p);

if(m_blocks_sending.find(p) != m_blocks_sending.end())
Expand Down Expand Up @@ -609,10 +603,9 @@ ClientInterface::~ClientInterface()
{
MutexAutoLock clientslock(m_clients_mutex);

for (RemoteClientMap::iterator i = m_clients.begin();
i != m_clients.end(); ++i) {
for (auto &client_it : m_clients) {
// Delete client
delete i->second;
delete client_it.second;
}
}
}
Expand Down Expand Up @@ -660,8 +653,8 @@ void ClientInterface::UpdatePlayerList()
if(!clients.empty())
infostream<<"Players:"<<std::endl;

for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
RemotePlayer *player = m_env->getPlayer(*i);
for (u16 i : clients) {
RemotePlayer *player = m_env->getPlayer(i);

if (player == NULL)
continue;
Expand All @@ -670,12 +663,12 @@ void ClientInterface::UpdatePlayerList()

{
MutexAutoLock clientslock(m_clients_mutex);
RemoteClient* client = lockedGetClientNoEx(*i);
RemoteClient* client = lockedGetClientNoEx(i);
if (client)
client->PrintInfo(infostream);
}

m_clients_names.push_back(player->getName());
m_clients_names.emplace_back(player->getName());
}
}
}
Expand All @@ -689,9 +682,8 @@ void ClientInterface::send(u16 peer_id, u8 channelnum,
void ClientInterface::sendToAll(NetworkPacket *pkt)
{
MutexAutoLock clientslock(m_clients_mutex);
for (RemoteClientMap::iterator i = m_clients.begin();
i != m_clients.end(); ++i) {
RemoteClient *client = i->second;
for (auto &client_it : m_clients) {
RemoteClient *client = client_it.second;

if (client->net_proto_version != 0) {
m_con->Send(client->peer_id,
Expand All @@ -705,9 +697,8 @@ void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacyp
u16 min_proto_ver)
{
MutexAutoLock clientslock(m_clients_mutex);
for (std::unordered_map<u16, RemoteClient*>::iterator i = m_clients.begin();
i != m_clients.end(); ++i) {
RemoteClient *client = i->second;
for (auto &client_it : m_clients) {
RemoteClient *client = client_it.second;
NetworkPacket *pkt_to_send = nullptr;

if (client->net_proto_version >= min_proto_ver) {
Expand Down Expand Up @@ -738,8 +729,8 @@ RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)

if (n->second->getState() >= state_min)
return n->second;
else
return NULL;

return NULL;
}

RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min)
Expand All @@ -752,8 +743,8 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat

if (n->second->getState() >= state_min)
return n->second;
else
return NULL;

return NULL;
}

ClientState ClientInterface::getClientState(u16 peer_id)
Expand Down Expand Up @@ -795,10 +786,8 @@ void ClientInterface::DeleteClient(u16 peer_id)
//TODO this should be done by client destructor!!!
RemoteClient *client = n->second;
// Handle objects
for (std::set<u16>::iterator i = client->m_known_objects.begin();
i != client->m_known_objects.end(); ++i) {
for (u16 id : client->m_known_objects) {
// Get object
u16 id = *i;
ServerActiveObject* obj = m_env->getActiveObject(id);

if(obj && obj->m_known_by_count > 0)
Expand Down
8 changes: 3 additions & 5 deletions src/clientmap.cpp
View file
Expand Up @@ -274,8 +274,8 @@ struct MeshBufListList

void clear()
{
for (int l = 0; l < MAX_TILE_LAYERS; l++)
lists[l].clear();
for (auto &list : lists)
list.clear();
}

void add(scene::IMeshBuffer *buf, u8 layer)
Expand Down Expand Up @@ -441,9 +441,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
}

// Render all layers in order
for (int layer = 0; layer < MAX_TILE_LAYERS; layer++) {
std::vector<MeshBufList> &lists = drawbufs.lists[layer];

for (auto &lists : drawbufs.lists) {
int timecheck_counter = 0;
for (MeshBufList &list : lists) {
timecheck_counter++;
Expand Down
38 changes: 19 additions & 19 deletions src/clouds.cpp
View file
Expand Up @@ -237,8 +237,8 @@ void Clouds::render()
switch(i)
{
case 0: // top
for(int j=0;j<4;j++){
v[j].Normal.set(0,1,0);
for (video::S3DVertex &vertex : v) {
vertex.Normal.set(0,1,0);
}
v[0].Pos.set(-rx, ry,-rz);
v[1].Pos.set(-rx, ry, rz);
Expand All @@ -251,9 +251,9 @@ void Clouds::render()
if(grid[j])
continue;
}
for(int j=0;j<4;j++){
v[j].Color = c_side_1;
v[j].Normal.set(0,0,-1);
for (video::S3DVertex &vertex : v) {
vertex.Color = c_side_1;
vertex.Normal.set(0,0,-1);
}
v[0].Pos.set(-rx, ry,-rz);
v[1].Pos.set( rx, ry,-rz);
Expand All @@ -266,9 +266,9 @@ void Clouds::render()
if(grid[j])
continue;
}
for(int j=0;j<4;j++){
v[j].Color = c_side_2;
v[j].Normal.set(1,0,0);
for (video::S3DVertex &vertex : v) {
vertex.Color = c_side_2;
vertex.Normal.set(1,0,0);
}
v[0].Pos.set( rx, ry,-rz);
v[1].Pos.set( rx, ry, rz);
Expand All @@ -281,9 +281,9 @@ void Clouds::render()
if(grid[j])
continue;
}
for(int j=0;j<4;j++){
v[j].Color = c_side_1;
v[j].Normal.set(0,0,-1);
for (video::S3DVertex &vertex : v) {
vertex.Color = c_side_1;
vertex.Normal.set(0,0,-1);
}
v[0].Pos.set( rx, ry, rz);
v[1].Pos.set(-rx, ry, rz);
Expand All @@ -296,19 +296,19 @@ void Clouds::render()
if(grid[j])
continue;
}
for(int j=0;j<4;j++){
v[j].Color = c_side_2;
v[j].Normal.set(-1,0,0);
for (video::S3DVertex &vertex : v) {
vertex.Color = c_side_2;
vertex.Normal.set(-1,0,0);
}
v[0].Pos.set(-rx, ry, rz);
v[1].Pos.set(-rx, ry,-rz);
v[2].Pos.set(-rx, 0,-rz);
v[3].Pos.set(-rx, 0, rz);
break;
case 5: // bottom
for(int j=0;j<4;j++){
v[j].Color = c_bottom;
v[j].Normal.set(0,-1,0);
for (video::S3DVertex &vertex : v) {
vertex.Color = c_bottom;
vertex.Normal.set(0,-1,0);
}
v[0].Pos.set( rx, 0, rz);
v[1].Pos.set(-rx, 0, rz);
Expand All @@ -320,8 +320,8 @@ void Clouds::render()
v3f pos(p0.X, m_params.height * BS, p0.Y);
pos -= intToFloat(m_camera_offset, BS);

for(u16 i=0; i<4; i++)
v[i].Pos += pos;
for (video::S3DVertex &vertex : v)
vertex.Pos += pos;
u16 indices[] = {0,1,2,2,3,0};
driver->drawVertexPrimitiveList(v, 4, indices, 2,
video::EVT_STANDARD, scene::EPT_TRIANGLES, video::EIT_16BIT);
Expand Down
22 changes: 10 additions & 12 deletions src/content_sao.cpp
View file
Expand Up @@ -245,9 +245,8 @@ LuaEntitySAO::~LuaEntitySAO()
m_env->getScriptIface()->luaentity_Remove(m_id);
}

for (std::unordered_set<u32>::iterator it = m_attached_particle_spawners.begin();
it != m_attached_particle_spawners.end(); ++it) {
m_env->deleteParticleSpawner(*it, false);
for (u32 attached_particle_spawner : m_attached_particle_spawners) {
m_env->deleteParticleSpawner(attached_particle_spawner, false);
}
}

Expand All @@ -267,7 +266,7 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
m_hp = m_prop.hp_max;
// Activate entity, supplying serialized state
m_env->getScriptIface()->
luaentity_Activate(m_id, m_init_state.c_str(), dtime_s);
luaentity_Activate(m_id, m_init_state, dtime_s);
} else {
m_prop.infotext = m_init_name;
}
Expand All @@ -281,7 +280,7 @@ ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
s16 hp = 1;
v3f velocity;
float yaw = 0;
if(data != ""){
if (!data.empty()) {
std::istringstream is(data, std::ios::binary);
// read version
u8 version = readU8(is);
Expand Down Expand Up @@ -791,10 +790,10 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
m_prop.visual = "upright_sprite";
m_prop.visual_size = v2f(1, 2);
m_prop.textures.clear();
m_prop.textures.push_back("player.png");
m_prop.textures.push_back("player_back.png");
m_prop.textures.emplace_back("player.png");
m_prop.textures.emplace_back("player_back.png");
m_prop.colors.clear();
m_prop.colors.push_back(video::SColor(255, 255, 255, 255));
m_prop.colors.emplace_back(255, 255, 255, 255);
m_prop.spritediv = v2s16(1,1);
// end of default appearance
m_prop.is_visible = true;
Expand Down Expand Up @@ -843,9 +842,8 @@ void PlayerSAO::removingFromEnvironment()
ServerActiveObject::removingFromEnvironment();
if (m_player->getPlayerSAO() == this) {
unlinkPlayerSessionAndSave();
for (std::unordered_set<u32>::iterator it = m_attached_particle_spawners.begin();
it != m_attached_particle_spawners.end(); ++it) {
m_env->deleteParticleSpawner(*it, false);
for (u32 attached_particle_spawner : m_attached_particle_spawners) {
m_env->deleteParticleSpawner(attached_particle_spawner, false);
}
}
}
Expand Down Expand Up @@ -897,7 +895,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
return os.str();
}

void PlayerSAO::getStaticData(std::string *) const
void PlayerSAO::getStaticData(std::string * result) const
{
FATAL_ERROR("Deprecated function");
}
Expand Down

0 comments on commit ae9b5e0

Please sign in to comment.