C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) #5984

nerzhul · 2017-06-14T14:13:10Z

C++11 introduced the possibility to define the default values directly in class definitions, do it on current code

This patchset cleanup src/{a*,b*,c*-> constants.h} files

SmallJoker · 2017-06-14T18:11:24Z

src/clientiface.h

@@ -388,7 +364,7 @@ class RemoteClient
 		Block is removed when GOTBLOCKS is received.
 		Value is time from sending. (not used at the moment)
 	*/
-	std::map<v3s16, float> m_blocks_sending;
+	std::map<v3s16, float> m_blocks_sending = {};


Aren't sets/maps defined to be empty when initialized?

i forgot to remove that my bad :)

SmallJoker · 2017-06-14T18:13:51Z

src/collision.h

+	v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
+	bool bouncy = false;
+	v3f old_speed = v3f(0.0f, 0.0f, 0.0f);
+	v3f new_speed = v3f(0.0f, 0.0f, 0.0f);


They're defined to be 0,0,0 in the constructor without args

then i will remove all standard v3f v3s16 :)

SmallJoker · 2017-06-14T18:15:46Z

src/clouds.h

 	v2f m_speed;
-	v3s16 m_camera_offset;
-	video::SColorf m_color;
+	v3s16 m_camera_offset = v3s16(0, 0, 0);


Also set to 0 when initialized.

C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed

nerzhul · 2017-06-14T18:29:11Z

All points fixed

nerzhul · 2017-06-14T18:54:28Z

src/collision.cpp

@@ -499,7 +498,6 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 				info.type = COLLISION_NODE;

 			info.node_p = nearest_info.position;
-			info.bouncy = bouncy;


there are affected but never used since 2012 it's why i removed them from code

* remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code

nerzhul · 2017-06-14T20:35:11Z

I added a second commit to this PR to make things advance (it's boring task but should be done)

SmallJoker · 2017-06-15T18:35:17Z

src/content_sao.h

+	bool m_physics_override_sneak = true;
+	bool m_physics_override_sneak_glitch = false;
+	bool m_physics_override_new_move = true;
+	bool m_physics_override_sent = false;


Could you please line up these values for better readability?

what do you mean ?

SmallJoker · 2017-06-15T18:36:18Z

src/guiChatConsole.h


 	// font
-	gui::IGUIFont* m_font;
+	gui::IGUIFont* m_font = nullptr;


Wrong pointer position

SmallJoker · 2017-06-15T18:37:12Z

src/guiEngine.h

@@ -272,7 +272,7 @@ class GUIEngine {
 	void setTopleftText(const std::string &text);

 	/** pointer to gui element shown at topleft corner */
-	irr::gui::IGUIStaticText*	m_irr_toplefttext;
+	irr::gui::IGUIStaticText*	m_irr_toplefttext = nullptr;


Pointer style wrong here too

Zeno- · 2017-06-16T08:57:19Z

👍

Zeno- · 2017-06-16T09:00:03Z

src/collision.h

-	bool bouncy;
+	CollisionInfo() {}
+	CollisionType type = COLLISION_NODE;
+	v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE


Is it safe to use -32768?

the value fits in the container, i don't really know it's the original behaviour, i think we can keep this as is as it's not a PR which should trigger regression by changing values :)

… (part 1) (minetest#5984) * C++11 patchset 9: move hardcoded init parameters to class definitions C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed * More constructor cleanups + some variables removal * remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code

nerzhul added the Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements label Jun 14, 2017

nerzhul force-pushed the cpp11_initializers_1 branch from 77d4a21 to 260bcae Compare June 14, 2017 15:47

nerzhul added this to Todo in Minetest C++11 Jun 14, 2017

SmallJoker reviewed Jun 14, 2017

View reviewed changes

nerzhul force-pushed the cpp11_initializers_1 branch from 260bcae to 9f4c5e3 Compare June 14, 2017 18:28

nerzhul commented Jun 14, 2017

View reviewed changes

nerzhul added this to Ready to merge in Minetest 5.0.0 blockers Jun 14, 2017

SmallJoker reviewed Jun 15, 2017

View reviewed changes

src/guiChatConsole.h Outdated

// font

gui::IGUIFont* m_font;

gui::IGUIFont* m_font = nullptr;

Copy link

Member

SmallJoker Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong pointer position

SmallJoker reviewed Jun 15, 2017

View reviewed changes

Pointer style fix

bf901d3

Zeno- reviewed Jun 16, 2017

View reviewed changes

nerzhul added the One approval ✅ ◻️ label Jun 16, 2017

nerzhul merged commit 76be103 into minetest:master Jun 16, 2017

ShadowNinja removed this from Ready to merge in Minetest 5.0.0 blockers Jun 17, 2017

nerzhul moved this from Todo to Done in Minetest C++11 Jun 17, 2017

nerzhul deleted the cpp11_initializers_1 branch June 19, 2017 13:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) #5984

C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) #5984

nerzhul commented Jun 14, 2017 •

edited

SmallJoker Jun 14, 2017

sfan5 Jun 14, 2017

nerzhul Jun 14, 2017

SmallJoker Jun 14, 2017

nerzhul Jun 14, 2017

SmallJoker Jun 14, 2017

nerzhul commented Jun 14, 2017

nerzhul Jun 14, 2017

nerzhul commented Jun 14, 2017

SmallJoker Jun 15, 2017

nerzhul Jun 15, 2017

SmallJoker Jun 15, 2017

SmallJoker Jun 15, 2017

Zeno- commented Jun 16, 2017

Zeno- Jun 16, 2017

nerzhul Jun 16, 2017

C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) #5984

C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) #5984

Conversation

nerzhul commented Jun 14, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nerzhul commented Jun 14, 2017

Choose a reason for hiding this comment

nerzhul commented Jun 14, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Zeno- commented Jun 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nerzhul commented Jun 14, 2017 •

edited