celeron55/buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix coding style

Browse Source
This commit is contained in:
Perttu Ahola 2014-11-01 22:55:43 +02:00
parent c551ab9626
commit 24ac1d7fbc
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/voxelworld/voxelworld.cpp
View File

@ -1162,7 +1162,7 @@ struct Module: public interface::Module, public voxelworld::Interface
m_voxel_reg->deserialize(voxel_reg_data);*/ m_voxel_reg->deserialize(voxel_reg_data);*/
// Start up normally // Start up normally
on_start(); on_start();
} }
void on_tick(const interface::TickEvent &event) void on_tick(const interface::TickEvent &event)
@ -1209,9 +1209,9 @@ struct Module: public interface::Module, public voxelworld::Interface
packet.sender, PV3I_PARAMS(section_p)); packet.sender, PV3I_PARAMS(section_p));
}*/ }*/
// Interface // Interface
void create_instance(SceneReference scene_ref, const pv::Region &region) void create_instance(SceneReference scene_ref, const pv::Region &region)
{ {
auto it = m_instances.find(scene_ref); auto it = m_instances.find(scene_ref);
// TODO: Is an exception the best way to handle this? // TODO: Is an exception the best way to handle this?

9
src/impl/mesh.cpp
View File

@ -841,14 +841,9 @@ void generate_voxel_physics_boxes(
VoxelInstance v_orig = volume_orig.getVoxelAt(x, y, z); VoxelInstance v_orig = volume_orig.getVoxelAt(x, y, z);
const interface::CachedVoxelDefinition *def = const interface::CachedVoxelDefinition *def =
voxel_reg->get_cached(v_orig); voxel_reg->get_cached(v_orig);
if(!def) if(!def){
throw Exception(ss_()+"Undefined voxel: "+itos(v_orig.get_id())); throw Exception(ss_()+"Undefined voxel: "+itos(v_orig.get_id()));
}
uint8_t v = (def && def->physically_solid); uint8_t v = (def && def->physically_solid);
volume.setVoxelAt(x, y, z, v); volume.setVoxelAt(x, y, z, v);
} }