Style: Fix whole-line commented code

They do not play well with clang-format which aligns the `//` part
with the rest of the code block, thus producing badly indented commented code.

28 files changed, 114 insertions, 88 deletions

diff --git a/modules/chibi/cp_loader_it_samples.cpp b/modules/chibi/cp_loader_it_samples.cpp
index 60db9b7f74..c736c99c0f 100644
--- a/modules/chibi/cp_loader_it_samples.cpp
+++ b/modules/chibi/cp_loader_it_samples.cpp
@@ -147,7 +147,7 @@ CPLoader::Error CPLoader_IT::load_sample(CPSample *p_sample) {
 	p_sample->set_sample_data(samp_id);
 	if (!samp_id.is_null()) {
 		
-	//	printf("Loaded ID: stereo: %i len %i 16bit %i\n",CPSampleManager::get_singleton()->is_stereo(samp_id), CPSampleManager::get_singleton()->get_size( samp_id), CPSampleManager::get_singleton()->is_16bits( samp_id) );
+		//printf("Loaded ID: stereo: %i len %i 16bit %i\n",CPSampleManager::get_singleton()->is_stereo(samp_id), CPSampleManager::get_singleton()->get_size( samp_id), CPSampleManager::get_singleton()->is_16bits( samp_id) );
 	}
 	
 	CP_ERR_COND_V( file->eof_reached(),FILE_CORRUPTED );
diff --git a/modules/chibi/cp_loader_mod.cpp b/modules/chibi/cp_loader_mod.cpp
index 4a47ce5c43..cfa3e34736 100644
--- a/modules/chibi/cp_loader_mod.cpp
+++ b/modules/chibi/cp_loader_mod.cpp
@@ -208,7 +208,7 @@ CPLoader::Error CPLoader_MOD::load_song(const char *p_file,CPSong *p_song,bool p
 
 		
 	uint8_t order_count=file->get_byte();
-//	uint8_t loop_to=file->get_byte();
+	//uint8_t loop_to=file->get_byte();
 	
 	
 	int pattern_count=0;
diff --git a/modules/chibi/cp_loader_s3m.cpp b/modules/chibi/cp_loader_s3m.cpp
index eb5fad12e1..4943e6d86c 100644
--- a/modules/chibi/cp_loader_s3m.cpp
+++ b/modules/chibi/cp_loader_s3m.cpp
@@ -102,7 +102,7 @@ void CPLoader_S3M::set_header() {
 
 
 	song->set_name( header.songname );
-//	song->variables.filename=
+	//song->variables.filename=
 	
 	song->set_row_highlight_minor( 4 );
 	song->set_row_highlight_major( 16 );
@@ -135,7 +135,7 @@ CPLoader::Error  CPLoader_S3M::load_sample(CPSample *p_sample) {
 		uint32_t samplepos=(uint32_t)file->get_byte() << 16;
                 samplepos|=file->get_word();
 		samplepos*=16;	
-//		printf("sample at %i\n",samplepos);
+		//printf("sample at %i\n",samplepos);
 		/**/
                 int sample_size=file->get_dword();
 		
@@ -178,7 +178,7 @@ CPLoader::Error  CPLoader_S3M::load_sample(CPSample *p_sample) {
 			
 
 		if ((type!=1) || scrs[0]!='S' || scrs[1]!='C' || scrs[2]!='R' || scrs[3]!='S' ) {
-//			printf("type: %i, %c%c%c%c\n",type,scrs[0],scrs[1],scrs[2],scrs[3]);
+			//printf("type: %i, %c%c%c%c\n",type,scrs[0],scrs[1],scrs[2],scrs[3]);
 			CP_PRINTERR("Not an S3M CPSample!");
 			return FILE_CORRUPTED;
 		}
diff --git a/modules/chibi/cp_loader_xm.cpp b/modules/chibi/cp_loader_xm.cpp
index 65c7bc7ee1..cbd883642c 100644
--- a/modules/chibi/cp_loader_xm.cpp
+++ b/modules/chibi/cp_loader_xm.cpp
@@ -399,7 +399,7 @@ CPLoader::Error CPLoader_XM::load_song(const char *p_file,CPSong *p_song,bool p_
 
 
 		instrument.set_name( instrname );
-//		printf("Header Len: %i, CPInstrument %i, %i samples , name:  s,\n",hsize,i,sampnum,instrname);
+		//printf("Header Len: %i, CPInstrument %i, %i samples , name:  s,\n",hsize,i,sampnum,instrname);
 		
 		if (sampnum==0) {
 			//aux=file->get_dword(); //Why is this for? -- for nothing, skipped
diff --git a/modules/chibi/cp_player_data.h b/modules/chibi/cp_player_data.h
index c59df5f0d9..2157319855 100644
--- a/modules/chibi/cp_player_data.h
+++ b/modules/chibi/cp_player_data.h
@@ -124,7 +124,7 @@ class CPPlayer {
 		CPInstrument* instrument_ptr;
 		CPSample*     sample_ptr;
 
-//		Sample_Data *sample_data;
+		//Sample_Data *sample_data;
 
 		int32_t period;		
 
diff --git a/modules/chibi/cp_player_data_effects.cpp b/modules/chibi/cp_player_data_effects.cpp
index 6c774afb16..56fb7a2905 100644
--- a/modules/chibi/cp_player_data_effects.cpp
+++ b/modules/chibi/cp_player_data_effects.cpp
@@ -615,7 +615,7 @@ void CPPlayer::do_effect_S(int p_track) {
                         break;
                 case 8: {/* S8x set panning position */
 
-//			if (pf->panflag) {
+			//if (pf->panflag) {
                                 if (inf<=8) inf<<=4;
                                 else inf*=17;
                                 control.channel[p_track].panning=control.channel[p_track].channel_panning=inf;
diff --git a/modules/chibi/cp_player_data_events.cpp b/modules/chibi/cp_player_data_events.cpp
index 7ec3f1931c..94a048ab2f 100644
--- a/modules/chibi/cp_player_data_events.cpp
+++ b/modules/chibi/cp_player_data_events.cpp
@@ -194,7 +194,7 @@ void CPPlayer::Voice_Control::update_info_from_master_channel() {
 	reverb_send=master_channel->reverb_send;
 	chorus_send=master_channel->chorus_send;
 
-//	last_note_type=master_channel->last_note_type;
+	//last_note_type=master_channel->last_note_type;
 
 	sample_start_index=master_channel->sample_start_index;
 	filter=master_channel->filter;
@@ -262,7 +262,7 @@ void CPPlayer::update_mixer() {
 		/* Start Envelopes */	
                	if ( song->has_instruments() && ((v.kick==KICK_NOTE)||(v.kick==KICK_ENVELOPE))) {
 	
-//			Voice_Control *carry=0;
+			//Voice_Control *carry=0;
 			
 			
 			if (v.has_master_channel && v.master_channel->carry.maybe) {
@@ -462,7 +462,7 @@ void CPPlayer::update_mixer() {
 			} else {
 
 				filter_env=pe_value+32; //max 64
-//			        printf("pitch envelope at %i",filter_env);
+				//printf("pitch envelope at %i",filter_env);
 			
 			}
 		}
@@ -602,17 +602,19 @@ void CPPlayer::handle_tick() {
 		/* process pattern-delay. pf->patdly2 is the counter and pf->patdly is
 		   the command memory. */
 
-//		if (control.pattern_delay_1) {
-
-//			control.pattern_delay_2=control.pattern_delay_1;
-//			control.pattern_delay_1=0;
-//		}
-//		if (control.pattern_delay_2) {
-//			 patterndelay active
-//			if (--control.pattern_delay_2)
-//				 so turn back pf->patpos by 1
-//				if (pf->patpos) pf->patpos--;
-//		}
+		/*
+		if (control.pattern_delay_1) {
+
+			control.pattern_delay_2=control.pattern_delay_1;
+			control.pattern_delay_1=0;
+		}
+		if (control.pattern_delay_2) {
+			patterndelay active
+			if (--control.pattern_delay_2)
+				// so turn back pf->patpos by 1
+				if (pf->patpos) pf->patpos--;
+		}
+		*/
 
 		if (control.play_mode!=PLAY_NOTHING) {
 
diff --git a/modules/chibi/cp_player_data_notes.cpp b/modules/chibi/cp_player_data_notes.cpp
index 1bfe24bc20..189403343c 100644
--- a/modules/chibi/cp_player_data_notes.cpp
+++ b/modules/chibi/cp_player_data_notes.cpp
@@ -67,7 +67,7 @@ void CPPlayer::process_new_note(int p_track,uint8_t p_note) { // if there's real
 
 bool CPPlayer::process_new_instrument(int p_track,uint8_t p_instrument) {
 
-//	bool different_instrument=false;
+	//bool different_instrument=false;
 	ERR_FAIL_INDEX_V(p_instrument,CPSong::MAX_INSTRUMENTS,false);
 	
 	if ( song->has_instruments() ) {
diff --git a/modules/chibi/cp_player_data_utils.cpp b/modules/chibi/cp_player_data_utils.cpp
index 1ee3f30b33..b99dbfcb99 100644
--- a/modules/chibi/cp_player_data_utils.cpp
+++ b/modules/chibi/cp_player_data_utils.cpp
@@ -111,8 +111,10 @@ int CPPlayer::find_empty_voice() {
 
  	for (i=0;i<control.max_voices;i++) {
 		/* allow us to take over a nonexisting sample */
-//		if ((voice[i].s==NULL)
-//			return k;
+		/*
+		if ((voice[i].s==NULL)
+			return k;
+		*/
 
 		if ((voice[i].kick==KICK_NOTHING)||(voice[i].kick==KICK_ENVELOPE)) {
 
diff --git a/modules/chibi/event_stream_chibi.cpp b/modules/chibi/event_stream_chibi.cpp
index 8bccdb3102..ab34080525 100644
--- a/modules/chibi/event_stream_chibi.cpp
+++ b/modules/chibi/event_stream_chibi.cpp
@@ -408,8 +408,8 @@ void CPMixerImpl::set_voice_chorus_send(int p_voice_index,int p_chorus){
 
 void CPMixerImpl::set_reverb_mode(ReverbMode p_mode){
 
-//	Voice &v=voices[p_voice_index];
-//	ERR_FAIL_COND(v.channel==AudioMixer::INVALID_CHANNEL);
+	//Voice &v=voices[p_voice_index];
+	//ERR_FAIL_COND(v.channel==AudioMixer::INVALID_CHANNEL);
 	switch(p_mode) {
 		case CPMixer::REVERB_MODE_STUDIO_SMALL: reverb_type=AudioMixer::REVERB_SMALL; break;
 		case CPMixer::REVERB_MODE_STUDIO_MEDIUM: reverb_type=AudioMixer::REVERB_MEDIUM; break;
@@ -422,8 +422,8 @@ void CPMixerImpl::set_reverb_mode(ReverbMode p_mode){
 
 void CPMixerImpl::set_chorus_params(unsigned int p_delay_ms,unsigned int p_separation_ms,unsigned int p_depth_ms10,unsigned int p_speed_hz10){
 
-//	Voice &v=voices[p_voice_index];
-//	ERR_FAIL_COND(v.channel==AudioMixer::INVALID_CHANNEL);
+	//Voice &v=voices[p_voice_index];
+	//ERR_FAIL_COND(v.channel==AudioMixer::INVALID_CHANNEL);
 
 }
 
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp
index 82deae9630..5295183c35 100644
--- a/modules/dds/texture_loader_dds.cpp
+++ b/modules/dds/texture_loader_dds.cpp
@@ -221,7 +221,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
 	if (!(flags&DDSD_MIPMAPCOUNT))
 		mipmaps=1;
 
-//	print_line("found format: "+String(dds_format_info[dds_format].name));
+	//print_line("found format: "+String(dds_format_info[dds_format].name));
 
 	PoolVector<uint8_t> src_data;
 
diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp
index 43d9988de1..d10634e9ea 100644
--- a/modules/enet/networked_multiplayer_enet.cpp
+++ b/modules/enet/networked_multiplayer_enet.cpp
@@ -506,8 +506,10 @@ uint32_t NetworkedMultiplayerENet::_gen_unique_id() const {
 					(uint32_t)OS::get_singleton()->get_unix_time(), hash );
 		hash = hash_djb2_one_32(
 					(uint32_t)OS::get_singleton()->get_data_dir().hash64(), hash );
-		//hash = hash_djb2_one_32(
-		//			(uint32_t)OS::get_singleton()->get_unique_ID().hash64(), hash );
+		/*
+		hash = hash_djb2_one_32(
+					(uint32_t)OS::get_singleton()->get_unique_ID().hash64(), hash );
+		*/
 		hash = hash_djb2_one_32(
 					(uint32_t)((uint64_t)this), hash ); //rely on aslr heap
 		hash = hash_djb2_one_32(
diff --git a/modules/etc1/image_etc.cpp b/modules/etc1/image_etc.cpp
index 845084fef7..36ff1b86df 100644
--- a/modules/etc1/image_etc.cpp
+++ b/modules/etc1/image_etc.cpp
@@ -138,13 +138,13 @@ static void _compress_etc(Image *p_img) {
 		uint8_t *dst = &w[dst_data.size()-mmsize];
 
 
-//		print_line("bh: "+itos(bh)+" bw: "+itos(bw));
+		//print_line("bh: "+itos(bh)+" bw: "+itos(bw));
 
 		for(int y=0;y<bh;y++) {
 
 			for(int x=0;x<bw;x++) {
 
-//				print_line("x: "+itos(x)+" y: "+itos(y));
+				//print_line("x: "+itos(x)+" y: "+itos(y));
 
 				uint8_t block[4*4*4];
 				zeromem(block,4*4*4);
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp
index 17a9c549b4..8e9e94cc48 100644
--- a/modules/gdscript/gd_compiler.cpp
+++ b/modules/gdscript/gd_compiler.cpp
@@ -1420,9 +1420,10 @@ Error GDCompiler::_parse_function(GDScript *p_script,const GDParser::ClassNode *
 
 	GDFunction *gdfunc=NULL;
 
-	//if (String(p_func->name)=="") { //initializer func
-	//	gdfunc = &p_script->initializer;
-
+	/*
+	if (String(p_func->name)=="") { //initializer func
+		gdfunc = &p_script->initializer;
+	*/
 	//} else { //regular func
 		p_script->member_functions[func_name]=memnew(GDFunction);
 		gdfunc = p_script->member_functions[func_name];
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index ab917fc869..19472d3d46 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -364,10 +364,12 @@ static GDCompletionIdentifier _get_type_from_variant(const Variant& p_variant) {
 	if (p_variant.get_type()==Variant::OBJECT) {
 		Object *obj = p_variant;
 		if (obj) {
-			//if (obj->cast_to<GDNativeClass>()) {
-			//	t.obj_type=obj->cast_to<GDNativeClass>()->get_name();
-			//	t.value=Variant();
-			//} else {
+			/*
+			if (obj->cast_to<GDNativeClass>()) {
+				t.obj_type=obj->cast_to<GDNativeClass>()->get_name();
+				t.value=Variant();
+			} else {
+			*/
 				t.obj_type=obj->get_class();
 			//}
 		}
@@ -1771,7 +1773,7 @@ static void _find_type_arguments(GDCompletionContext& context,const GDParser::No
 						String s = E->get().name;
 						if (!s.begins_with("autoload/"))
 							continue;
-					//	print_line("found "+s);
+						//print_line("found "+s);
 						String name = s.get_slice("/",1);
 						result.insert("\"/root/"+name+"\"");
 					}
@@ -1998,10 +2000,10 @@ static void _find_call_arguments(GDCompletionContext& context,const GDParser::No
 						List<MethodInfo> methods;
 						ClassDB::get_method_list(type,&methods);
 						for(List<MethodInfo>::Element *E=methods.front();E;E=E->next()) {
-							//if (E->get().arguments.size())
-							//	result.insert(E->get().name+"(");
-							//else
-							//	result.insert(E->get().name+"()");
+							if (E->get().arguments.size())
+								result.insert(E->get().name+"(");
+							else
+								result.insert(E->get().name+"()");
 						}*/
 					}
 					break;
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index 6aed7c9491..bd0704fff9 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -225,8 +225,8 @@ bool GDParser::_get_completable_identifier(CompletionType p_type,StringName& ide
 
 GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_allow_assign,bool p_parsing_constant) {
 
-//	Vector<Node*> expressions;
-//	Vector<OperatorNode::Operator> operators;
+	//Vector<Node*> expressions;
+	//Vector<OperatorNode::Operator> operators;
 
 	Vector<Expression> expression;
 
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 6ff29072c7..b216ef42b9 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -358,9 +358,11 @@ bool GDScript::get_property_default_value(const StringName& p_property, Variant
 
 #ifdef TOOLS_ENABLED
 
-	//for (const Map<StringName,Variant>::Element *I=member_default_values.front();I;I=I->next()) {
-	//	print_line("\t"+String(String(I->key())+":"+String(I->get())));
-	//}
+	/*
+	for (const Map<StringName,Variant>::Element *I=member_default_values.front();I;I=I->next()) {
+		print_line("\t"+String(String(I->key())+":"+String(I->get())));
+	}
+	*/
 	const Map<StringName,Variant>::Element *E=member_default_values_cache.find(p_property);
 	if (E) {
 		r_value=E->get();
@@ -1862,7 +1864,7 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script>& p_script,bool p_sof
 
 void GDScriptLanguage::frame() {
 
-	//	print_line("calls: "+itos(calls));
+	//print_line("calls: "+itos(calls));
 	calls=0;
 
 #ifdef DEBUG_ENABLED
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index 960b06f3ff..4d3baa5bc0 100644
--- a/modules/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
@@ -139,7 +139,7 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_properties) const;
 
 	Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error);
-//	void call_multilevel(const StringName& p_method,const Variant** p_args,int p_argcount);
+	//void call_multilevel(const StringName& p_method,const Variant** p_args,int p_argcount);
 
 	static void _bind_methods();
 public:
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp
index 30ac988295..5dabf50ba1 100644
--- a/modules/gdscript/gd_tokenizer.cpp
+++ b/modules/gdscript/gd_tokenizer.cpp
@@ -513,9 +513,11 @@ void GDTokenizerText::_advance() {
 				if (GETCHAR(1)=='=') {
 					_make_token(TK_OP_ASSIGN_ADD);
 					INCPOS(1);
-				//}  else if (GETCHAR(1)=='+') {
-				//	_make_token(TK_OP_PLUS_PLUS);
-				//	INCPOS(1);
+				/*
+				}  else if (GETCHAR(1)=='+') {
+					_make_token(TK_OP_PLUS_PLUS);
+					INCPOS(1);
+				*/
 				} else {
 					_make_token(TK_OP_ADD);
 				}
@@ -526,9 +528,11 @@ void GDTokenizerText::_advance() {
 				if (GETCHAR(1)=='=') {
 					_make_token(TK_OP_ASSIGN_SUB);
 					INCPOS(1);
-				//}  else if (GETCHAR(1)=='-') {
-				//	_make_token(TK_OP_MINUS_MINUS);
-				//	INCPOS(1);
+				/*
+				}  else if (GETCHAR(1)=='-') {
+					_make_token(TK_OP_MINUS_MINUS);
+					INCPOS(1);
+				*/
 				} else {
 					_make_token(TK_OP_SUB);
 				}
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 8bd346d7bb..271db4babc 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -731,7 +731,7 @@ void GridMap::_octant_update(const OctantKey &p_key) {
 					ii.shape->add_vertices_to_array(col_debug,xform);
 				}
 
-			//	print_line("PHIS x: "+xform);
+				//print_line("PHIS x: "+xform);
 			}
 
 			// add the item's navmesh at given xform to GridMap's Navigation ancestor
@@ -796,7 +796,7 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
 	for(Map<int,Octant::ItemInstances>::Element *E=g.items.front();E;E=E->next()) {
 
 		VS::get_singleton()->instance_set_scenario(E->get().multimesh_instance,RID());
-	//	VS::get_singleton()->instance_set_transform(E->get().multimesh_instance,get_global_transform());
+		//VS::get_singleton()->instance_set_transform(E->get().multimesh_instance,get_global_transform());
 		VS::get_singleton()->instance_set_room(E->get().multimesh_instance,RID());
 	}
 
@@ -1001,8 +1001,8 @@ void GridMap::_notification(int p_what) {
 			_update_area_instances();
 
 			for(Map<OctantKey,Octant*>::Element *E=octant_map.front();E;E=E->next()) {
-//				IndexKey ik;
-//				ik.key = E->key().indexkey;
+				//IndexKey ik;
+				//ik.key = E->key().indexkey;
 				_octant_enter_world(E->key());
 				_octant_update(E->key());
 			}
@@ -1201,7 +1201,7 @@ void GridMap::_bind_methods() {
 	ClassDB::bind_method(_MD("get_cell_item","x","y","z"),&GridMap::get_cell_item);
 	ClassDB::bind_method(_MD("get_cell_item_orientation","x","y","z"),&GridMap::get_cell_item_orientation);
 
-//	ClassDB::bind_method(_MD("_recreate_octants"),&GridMap::_recreate_octants);
+	//ClassDB::bind_method(_MD("_recreate_octants"),&GridMap::_recreate_octants);
 	ClassDB::bind_method(_MD("_update_dirty_map_callback"),&GridMap::_update_dirty_map_callback);
 	ClassDB::bind_method(_MD("resource_changed","resource"),&GridMap::resource_changed);
 
@@ -1706,10 +1706,12 @@ void GridMap::bake_geometry() {
 
 void GridMap::_baked_light_changed() {
 
-//	if (!baked_light_instance)
-//		VS::get_singleton()->instance_geometry_set_baked_light(get_instance(),RID());
-//	else
-//		VS::get_singleton()->instance_geometry_set_baked_light(get_instance(),baked_light_instance->get_baked_light_instance());
+	/*
+	if (!baked_light_instance)
+		VS::get_singleton()->instance_geometry_set_baked_light(get_instance(),RID());
+	else
+		VS::get_singleton()->instance_geometry_set_baked_light(get_instance(),baked_light_instance->get_baked_light_instance());
+	*/
 	for(Map<OctantKey,Octant*>::Element *E=octant_map.front();E;E=E->next()) {
 
 		for(Map<int,Octant::ItemInstances>::Element *F=E->get()->items.front();F;F=F->next()) {
diff --git a/modules/openssl/stream_peer_openssl.cpp b/modules/openssl/stream_peer_openssl.cpp
index 140ea1b9e7..8095b76100 100644
--- a/modules/openssl/stream_peer_openssl.cpp
+++ b/modules/openssl/stream_peer_openssl.cpp
@@ -35,8 +35,8 @@
 bool StreamPeerOpenSSL::_match_host_name(const char *name, const char *hostname) {
 
 	return Tool_Curl_cert_hostcheck(name,hostname)==CURL_HOST_MATCH;
-//	print_line("MATCH: "+String(name)+" vs "+String(hostname));
-//	return true;
+	//print_line("MATCH: "+String(name)+" vs "+String(hostname));
+	//return true;
 }
 
 Error StreamPeerOpenSSL::_match_common_name(const char *hostname, const X509 *server_cert) {
diff --git a/modules/pvr/texture_loader_pvr.cpp b/modules/pvr/texture_loader_pvr.cpp
index 564cd6687c..0d8cabb331 100644
--- a/modules/pvr/texture_loader_pvr.cpp
+++ b/modules/pvr/texture_loader_pvr.cpp
@@ -669,9 +669,11 @@ static void decompress_pvrtc(PVRTCBlock *p_comp_img, const int p_2bit, const int
 
 static void _pvrtc_decompress(Image* p_img) {
 
-//	static void decompress_pvrtc(const void *p_comp_img, const int p_2bit, const int p_width, const int p_height, unsigned char* p_dst) {
-//		decompress_pvrtc((PVRTCBlock*)p_comp_img,p_2bit,p_width,p_height,1,p_dst);
-//	}
+	/*
+	static void decompress_pvrtc(const void *p_comp_img, const int p_2bit, const int p_width, const int p_height, unsigned char* p_dst) {
+		decompress_pvrtc((PVRTCBlock*)p_comp_img,p_2bit,p_width,p_height,1,p_dst);
+	}
+	*/
 
 	ERR_FAIL_COND( p_img->get_format()!=Image::FORMAT_PVRTC2 && p_img->get_format()!=Image::FORMAT_PVRTC2A && p_img->get_format()!=Image::FORMAT_PVRTC4 && p_img->get_format()!=Image::FORMAT_PVRTC4A);
 
@@ -687,9 +689,11 @@ static void _pvrtc_decompress(Image* p_img) {
 
 	decompress_pvrtc((PVRTCBlock*)r.ptr(),_2bit,p_img->get_width(),p_img->get_height(),0,(unsigned char*)w.ptr());
 
-	//for(int i=0;i<newdata.size();i++) {
-	//	print_line(itos(w[i]));
-	//}
+	/*
+	for(int i=0;i<newdata.size();i++) {
+		print_line(itos(w[i]));
+	}
+	*/
 
 	w=PoolVector<uint8_t>::Write();
 	r=PoolVector<uint8_t>::Read();
diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index 5fe11c8d4c..9d2dfc7f56 100644
--- a/modules/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -81,6 +81,9 @@ void VideoStreamPlaybackTheora::video_write(void){
 	th_ycbcr_buffer yuv;
 	th_decode_ycbcr_out(td,yuv);
 
+	// FIXME: The way stuff is commented out with `//*/` closing comments
+	// sounds very fishy...
+
 	/*
 	int y_offset, uv_offset;
 	y_offset=(ti.pic_x&~1)+yuv[0].stride*(ti.pic_y&~1);
@@ -105,7 +108,7 @@ void VideoStreamPlaybackTheora::video_write(void){
 		}
 		format = Image::FORMAT_RGBA8;
 	}
-	//	*/
+		//*/
 
 	//*
 
@@ -228,7 +231,7 @@ void VideoStreamPlaybackTheora::video_write(void){
 			format = Image::FORMAT_YUV_422;
 		};
 	};
-	//	*/
+		//*/
 
 	frames_pending = 1;
 }
@@ -598,7 +601,7 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 
 
 				if (vd.granulepos>=0) {
-				//	print_line("wrote: "+itos(audio_frames_wrote)+" gpos: "+itos(vd.granulepos));
+					//print_line("wrote: "+itos(audio_frames_wrote)+" gpos: "+itos(vd.granulepos));
 				}
 
 				//print_line("mix audio!");
diff --git a/modules/visual_script/register_types.cpp b/modules/visual_script/register_types.cpp
index 79bf3d50b2..5fe87a4956 100644
--- a/modules/visual_script/register_types.cpp
+++ b/modules/visual_script/register_types.cpp
@@ -82,7 +82,7 @@ void register_visual_script_types() {
 	ClassDB::register_class<VisualScriptFunctionCall>();
 	ClassDB::register_class<VisualScriptPropertySet>();
 	ClassDB::register_class<VisualScriptPropertyGet>();
-//	ClassDB::register_type<VisualScriptScriptCall>();
+	//ClassDB::register_type<VisualScriptScriptCall>();
 	ClassDB::register_class<VisualScriptEmitSignal>();
 
 	ClassDB::register_class<VisualScriptReturn>();
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index 08796b3868..e1e180432a 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -2631,7 +2631,7 @@ void VisualScriptLanguage::debug_get_stack_level_locals(int p_level,List<String>
 	const StringName *f = _call_stack[l].function;
 
 	ERR_FAIL_COND(!_call_stack[l].instance->functions.has(*f));
-//	VisualScriptInstance::Function *func = &_call_stack[l].instance->functions[*f];
+	//VisualScriptInstance::Function *func = &_call_stack[l].instance->functions[*f];
 
 	VisualScriptNodeInstance *node =_call_stack[l].instance->instances[*_call_stack[l].current_id];
 	ERR_FAIL_COND(!node);
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 8a1385e113..37ee225aeb 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -822,7 +822,7 @@ void VisualScriptEditor::_member_selected() {
 
 
 	selected=ti->get_metadata(0);
-//	print_line("selected: "+String(selected));
+	//print_line("selected: "+String(selected));
 
 
 	if (ti->get_parent()==members->get_root()->get_children()) {
@@ -1136,9 +1136,11 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
 					undo_redo->add_undo_method(script.ptr(),"data_connect",name,E->get().from_node,E->get().from_port,E->get().to_node,E->get().to_port);
 				}
 
-				//for(int i=0;i<script->function_get_argument_count(name);i++) {
-				////	undo_redo->add_undo_method(script.ptr(),"function_add_argument",name,script->function_get_argument_name(name,i),script->function_get_argument_type(name,i));
-				//}
+				/*
+				for(int i=0;i<script->function_get_argument_count(name);i++) {
+					undo_redo->add_undo_method(script.ptr(),"function_add_argument",name,script->function_get_argument_name(name,i),script->function_get_argument_type(name,i));
+				}
+				*/
 				undo_redo->add_do_method(this,"_update_members");
 				undo_redo->add_undo_method(this,"_update_members");
 				undo_redo->add_do_method(this,"_update_graph");
diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp
index 9f3ba8a8cb..a8d78b9298 100644
--- a/modules/visual_script/visual_script_func_nodes.cpp
+++ b/modules/visual_script/visual_script_func_nodes.cpp
@@ -396,7 +396,7 @@ void VisualScriptFunctionCall::_update_method_cache() {
 	}
 
 
-//		print_line("BASE: "+String(type)+" FUNC: "+String(function));
+	//print_line("BASE: "+String(type)+" FUNC: "+String(function));
 	MethodBind *mb = ClassDB::get_method(type,function);
 	if (mb) {
 		use_default_args=mb->get_default_argument_count();
@@ -2508,7 +2508,7 @@ void register_visual_script_func_nodes() {
 	VisualScriptLanguage::singleton->add_register_func("functions/get",create_node_generic<VisualScriptPropertyGet>);
 
 	//VisualScriptLanguage::singleton->add_register_func("functions/call_script/call_self",create_script_call_node<VisualScriptScriptCall::CALL_MODE_SELF>);
-//	VisualScriptLanguage::singleton->add_register_func("functions/call_script/call_node",create_script_call_node<VisualScriptScriptCall::CALL_MODE_NODE_PATH>);
+	//VisualScriptLanguage::singleton->add_register_func("functions/call_script/call_node",create_script_call_node<VisualScriptScriptCall::CALL_MODE_NODE_PATH>);
 	VisualScriptLanguage::singleton->add_register_func("functions/emit_signal",create_node_generic<VisualScriptEmitSignal>);
 
 
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
index 4a18e88060..2b05daca16 100644
--- a/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp
@@ -78,7 +78,7 @@ int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f,ogg_int64_t offs, int w
 }
 int AudioStreamPlaybackOGGVorbis::_ov_close_func(void *_f) {
 
-//	printf("close %p\n",_f);
+	//printf("close %p\n",_f);
 	if (!_f)
 		return 0;
 	FileAccess *fa=(FileAccess*)_f;