Merge pull request #280 from OpenVicProject/minor-format-fixes

Minor formatting changes (mostly whitespace cleanup)

8 files changed, 18 insertions, 19 deletions

diff --git a/game/src/Game/Autoload/SoundManager.gd b/game/src/Game/Autoload/SoundManager.gd
index 01562f8..520afb1 100644
--- a/game/src/Game/Autoload/SoundManager.gd
+++ b/game/src/Game/Autoload/SoundManager.gd
@@ -41,7 +41,7 @@ func play_effect_stream(sound : AudioStream, volume : float = 1.0) -> void:
 
 func play_effect(sound : String) -> void:
 	play(sound, "SFX")
-	
+
 func play_effect_compat(sfx : String, fallback : AudioStream=null) -> void:
 	var sound:AudioStreamWAV = SoundSingleton.get_sound_stream(sfx)
 	var volume:float = SoundSingleton.get_sound_base_volume(sfx)
@@ -53,4 +53,3 @@ func play_effect_compat(sfx : String, fallback : AudioStream=null) -> void:
 		play_effect_stream(fallback)
 	else:
 		push_warning("Failed to find sound %s" % sfx)
-	
diff --git a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd
index 021c9f2..45e91d3 100644
--- a/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd
+++ b/game/src/Game/GameSession/NationManagementScreen/BudgetMenu.gd
@@ -203,7 +203,7 @@ func _update_info() -> void:
 
 	if _active:
 		if _gold_label:
-			_gold_label.text  = "%s¤" % GUINode.float_to_string_dp(_incVal - (_incVal % 7), 1)
+			_gold_label.text = "%s¤" % GUINode.float_to_string_dp(_incVal - (_incVal % 7), 1)
 
 		if _total_inc_label:
 			_total_inc_label.text = "%s¤" % GUINode.float_to_string_dp_dynamic(_incVal)
diff --git a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
index eb57387..b55d227 100644
--- a/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
+++ b/game/src/Game/GameSession/NationManagementScreen/PopulationMenu.gd
@@ -160,7 +160,7 @@ func _generate_province_list_row(index : int, type : MenuSingleton.ProvinceListE
 	return OK
 
 func _setup_province_list() -> void:
-	if not  _province_listbox:
+	if not _province_listbox:
 		_province_listbox = get_gui_listbox_from_nodepath(^"./country_pop/pop_province_list")
 
 		if not _province_listbox:
diff --git a/game/src/Game/GameSession/ProvinceIndexSampler.gdshaderinc b/game/src/Game/GameSession/ProvinceIndexSampler.gdshaderinc
index 1adcd95..acebdc6 100644
--- a/game/src/Game/GameSession/ProvinceIndexSampler.gdshaderinc
+++ b/game/src/Game/GameSession/ProvinceIndexSampler.gdshaderinc
@@ -13,7 +13,7 @@ uvec3 vec3_to_uvec3(vec3 v) {
 // (u, v) -> (province index bottom byte, province index top byte, terrain index byte)
 uvec3 read_uvec3(vec2 uv) {
 	uv *= province_shape_subdivisions;
-	vec2 subdivision_coords = mod(floor(uv),  province_shape_subdivisions);
+	vec2 subdivision_coords = mod(floor(uv), province_shape_subdivisions);
 	float idx = subdivision_coords.x + subdivision_coords.y * province_shape_subdivisions.x;
 	return vec3_to_uvec3(texture(province_shape_tex, vec3(uv, idx)).rgb);
 }
diff --git a/game/src/Game/GameSession/Topbar.gd b/game/src/Game/GameSession/Topbar.gd
index 2f1fdbf..aecdced 100644
--- a/game/src/Game/GameSession/Topbar.gd
+++ b/game/src/Game/GameSession/Topbar.gd
@@ -570,7 +570,7 @@ func _update_speed_controls() -> void:
 	var paused : bool = MenuSingleton.is_paused()
 	var speed : int = MenuSingleton.get_speed()
 
-	#  TODO - decide whether to disable these or not
+	# TODO - decide whether to disable these or not
 	# (they don't appear to get disabled in the base game)
 	#if _speed_up_button:
 	#	_speed_up_button.disabled = not MenuSingleton.can_increase_speed()
diff --git a/game/src/Game/Model/XACLoader.gd b/game/src/Game/Model/XACLoader.gd
index 6b12cf2..c16d1cd 100644
--- a/game/src/Game/Model/XACLoader.gd
+++ b/game/src/Game/Model/XACLoader.gd
@@ -197,13 +197,13 @@ static func _load_xac_model(source_file : String, is_unit : bool) -> Node3D:
 				break
 			skinning_chunk_ind += 1
 		if skinning_chunk_ind >= len(skinningChunks):
-			skinning_chunk_ind =  1
+			skinning_chunk_ind = 1
 			applyVertexWeights = false
 
 		var meshInstance : MeshInstance3D = MeshInstance3D.new()
 		node.add_child(meshInstance)
 		meshInstance.owner = node
-		
+
 		#stop the culling of units near the tops of screens
 		meshInstance.extra_cull_margin = EXTRA_CULL_MARGIN
 
diff --git a/game/src/Game/Model/XSMLoader.gd b/game/src/Game/Model/XSMLoader.gd
index bc85f9b..e1706ae 100644
--- a/game/src/Game/Model/XSMLoader.gd
+++ b/game/src/Game/Model/XSMLoader.gd
@@ -122,8 +122,8 @@ class MetadataChunk:
 	var unused : float
 	var fMaxAcceptableError : float
 	var fps : int # int32
-	var exporterMajorVersion : int  # byte
-	var exporterMinorVersion : int  # byte
+	var exporterMajorVersion : int # byte
+	var exporterMinorVersion : int # byte
 	var pad : int # 2x byte
 	var sourceApp : String
 	var origFileName : String
diff --git a/game/src/Game/MusicConductor/MusicConductor.gd b/game/src/Game/MusicConductor/MusicConductor.gd
index f7e3b2a..ade8fb4 100644
--- a/game/src/Game/MusicConductor/MusicConductor.gd
+++ b/game/src/Game/MusicConductor/MusicConductor.gd
@@ -34,7 +34,7 @@ func get_all_song_names() -> PackedStringArray:
 	for si : SongInfo in _available_songs:
 		songNames.append(si.song_name)
 	return songNames
-	
+
 func get_all_song_paths() -> PackedStringArray:
 	var songPaths : PackedStringArray = []
 	for si : SongInfo in _available_songs:
@@ -103,13 +103,13 @@ func setup_compat_song(file_name) -> void:
 	var metadata = MusicMetadata.new()
 	metadata.set_from_stream(stream)
 	var title = metadata.title
-	
+
 	if title == "":
 		#use the file name without the extension if there's no metadata
 		title = file_name.split(".")[0]
 	song.init_stream(file_name,title,stream)
 	_available_songs.append(song)
-	
+
 func add_compat_songs() -> void:
 	for file_name : String in SoundSingleton.song_list:
 		setup_compat_song(file_name)
@@ -128,13 +128,13 @@ func add_ootb_music() -> void:
 func generate_playlist() -> void:
 	var song_names = MusicConductor.get_all_song_paths()
 	var possible_indices = range(len(song_names)-1)
-	
+
 	var title_index = song_names.find(SoundSingleton.title_theme)
 	possible_indices.remove_at(title_index)
-	
+
 	var actual_playlist_len = min(preferred_playlist_len,len(possible_indices))
-	
-	#if the playlist size is too large or small, make it the same size as what we 
+
+	#if the playlist size is too large or small, make it the same size as what we
 	#need to support
 	if len(playlist) != actual_playlist_len:
 		playlist.resize(actual_playlist_len)
@@ -143,14 +143,14 @@ func generate_playlist() -> void:
 	#The song we just played can be in the playlist, just not the first one
 	if last_played != -1:
 		possible_indices.remove_at(last_played)
-	
+
 	#essentially shuffle-bag randomness, picking from a list of song indices
 	for i in range(actual_playlist_len):
 		var ind = randi_range(0,len(possible_indices)-1)
 		#add back the last song we just played as an option
 		if i==2:
 			possible_indices.append(last_played)
-		
+
 		playlist[i] = possible_indices[ind]
 		possible_indices.remove_at(ind)