Format all freeminer files with astyle

astyle --style=attach --indent=tab --keep-one-line-blocks --keep-one-line-statements --pad-oper
freeminer · Jan 15, 2015 · e967b9f · e967b9f
1 parent 8eb2b98
commit e967b9f
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 117 deletions.
diff --git a/src/circuit.cpp b/src/circuit.cpp
@@ -51,9 +51,8 @@ Circuit::Circuit(GameScripting* script, Map* map, INodeDefManager* ndef, std::st
 	m_since_last_save(0.0f),
 	m_max_id(0),
 	m_max_virtual_id(1),
-	m_savedir(savedir)
- {
-		load();
+	m_savedir(savedir) {
+	load();
 }
 
 Circuit::~Circuit() {
@@ -153,7 +152,7 @@ void Circuit::addElement(v3POS pos) {
 	MapNode node = m_map->getNodeNoEx(pos);
 
 	auto current_element_iterator = m_elements.insert(m_elements.begin(),
-	     CircuitElement(pos, m_max_id++, m_ndef->get(node).circuit_element_delay));
+	                                CircuitElement(pos, m_max_id++, m_ndef->get(node).circuit_element_delay));
 	m_pos_to_iterator[pos] = current_element_iterator;
 
 	// For each face add all other connected faces.
@@ -304,7 +303,7 @@ void Circuit::addWire(v3POS pos) {
 			for(auto i = all_connected.begin(); i != all_connected.end(); ++i) {
 				if(!(i->first->getFace(i->second).is_connected)) {
 					auto it = element_with_virtual.list_pointer->insert(
-						element_with_virtual.list_pointer->begin(), CircuitElementVirtualContainer());
+					              element_with_virtual.list_pointer->begin(), CircuitElementVirtualContainer());
 					it->element_pointer = i->first;
 					it->shift = i->second;
 					i->first->connectFace(i->second, it, element_with_virtual.list_pointer);
@@ -365,11 +364,11 @@ void Circuit::removeWire(v3POS pos) {
 
 				if(current_face_connected.size() > 1) {
 					auto new_virtual_element = m_virtual_elements.insert(
-						m_virtual_elements.begin(), CircuitElementVirtual(m_max_virtual_id++));
+					                               m_virtual_elements.begin(), CircuitElementVirtual(m_max_virtual_id++));
 
 					for(u32 j = 0; j < current_face_connected.size(); ++j) {
 						auto new_container = new_virtual_element->insert(
-						            new_virtual_element->begin(), CircuitElementVirtualContainer());
+						                         new_virtual_element->begin(), CircuitElementVirtualContainer());
 						new_container->element_pointer = current_face_connected[j].first;
 						new_container->shift = current_face_connected[j].second;
 						current_face_connected[j].first->connectFace(current_face_connected[j].second,

diff --git a/src/circuit_element.cpp b/src/circuit_element.cpp
@@ -63,7 +63,7 @@ u8 CircuitElement::reverse_rotate_face[] = {
 
 CircuitElement::CircuitElement(v3POS pos, u32 element_id, u8 delay) :
 	m_pos(pos), m_prev_input_state(0), m_current_input_state(0),
-	m_next_input_state(0), m_current_output_state(0){
+	m_next_input_state(0), m_current_output_state(0) {
 	m_element_id = element_id;
 	for(int i = 0; i < 6; ++i) {
 		m_faces[i].is_connected = false;
@@ -280,9 +280,9 @@ void CircuitElement::findConnectedWithFace(std::vector <std::pair <std::list<Cir
 
 					auto next_used_iterator = used.find(next_pos);
 					bool is_part_of_circuit = node_features.is_wire_connector || node_features.is_circuit_element ||
-						(node_features.is_wire && (next_node.getContent() == current_node.getContent()));
+					                          (node_features.is_wire && (next_node.getContent() == current_node.getContent()));
 					bool not_used = (next_used_iterator == used.end()) ||
-						!(next_used_iterator->second & next_real_face);
+					                !(next_used_iterator->second & next_real_face);
 
 					if(is_part_of_circuit && not_used) {
 						if(node_features.is_circuit_element) {
@@ -305,8 +305,7 @@ void CircuitElement::findConnectedWithFace(std::vector <std::pair <std::list<Cir
 	}
 }
 
-CircuitElementContainer CircuitElement::getFace(int id) const
-{
+CircuitElementContainer CircuitElement::getFace(int id) const {
 	return m_faces[id];
 }
 

diff --git a/src/circuit_element.h b/src/circuit_element.h
@@ -65,8 +65,7 @@ class INodeDefManager;
  * V - virtual elements
  */
 
-struct CircuitElementContainer
-{
+struct CircuitElementContainer {
 	std::list <CircuitElementVirtualContainer>::iterator list_iterator;
 	std::list <CircuitElementVirtual>::iterator list_pointer;