Small fixes

Checks should pass now.
TheGiraffe3 · Nov 2, 2024 · 767b9df · 767b9df
1 parent 17d327f
commit 767b9df
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 861 deletions.
diff --git a/source/CustomSale.cpp b/source/CustomSale.cpp
@@ -1,5 +1,5 @@
 /* CustomSale.cpp
-Copyright (c) 2021 by Hurleveur
+Copyright (c) 2024 by Hurleveur
 
 Endless Sky is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
@@ -56,9 +56,9 @@ void CustomSale::Load(const DataNode &node, bool eventChange)
 			amount += size > 2 ? line.Value(2) : 1.;
 		else
 			amount = size > 1 ? line.Value(1) : 1.;
-		// All values are converted into pourcentages if that is not how they are given (which would be indicated by %)
+		// All values are converted into percentages if that is not how they are given (which would be indicated by %)
 		// This means that the offset is handled as relative to the modified price instead of the default one.
-		// Outfitter changes always are pourcentages.
+		// Outfitter changes always are perrcentages.
 		if((mode != "outfitters"
 				&& (size == (2 + isAdd)
 				|| (size > 2 && line.Token(2 + isAdd) != "%"))))
@@ -160,7 +160,7 @@ void CustomSale::Load(const DataNode &node, bool eventChange)
 			conditions.Load(child);
 		}
 		// CustomSales are separated between outfits and outfitters in the data files.
-		// mode could apply to other things like shipyards and ships, later on.
+		// This mode could apply to other things like shipyards and ships, later on.
 		else if(mode == "outfits")
 		{
 			if(!add)
@@ -279,7 +279,7 @@ bool CustomSale::Add(const CustomSale &other, const Planet &planet, const Condit
 		else if(ours->second < it.second)
 			ours->second = it.second;
 	}
-	// For offsets, add them to each others.
+	// For offsets, add them to each other.
 	for(const auto &it : other.relativeOffsets)
 	{
 		auto ours = relativeOffsets.find(it.first);

diff --git a/source/CustomSale.h b/source/CustomSale.h
@@ -1,5 +1,5 @@
 /* CustomSale.h
-Copyright (c) 2021 by Hurleveur
+Copyright (c) 2024 by Hurleveur
 
 Endless Sky is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,7 @@ You should have received a copy of the GNU General Public License along with
 this program. If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CUSTOM_SALE_H_
-#define CUSTOM_SALE_H_
+#pragma once
 
 #include "ConditionSet.h"
 #include "LocationFilter.h"
@@ -98,6 +97,3 @@ class CustomSale {
 	// When loading we cannot be sure all outfits are loaded, so store those we need to convert into relative values.
 	std::vector<std::pair<const Outfit *, double *>> toConvert;
 };
-
-#endif
-
diff --git a/source/CustomSaleManager.cpp b/source/CustomSaleManager.cpp
@@ -1,5 +1,5 @@
 /* CustomSaleManager.cpp
-Copyright (c) 2023 by Hurleveur
+Copyright (c) 2024 by Hurleveur
 
 Endless Sky is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software

diff --git a/source/CustomSaleManager.h b/source/CustomSaleManager.h
@@ -1,5 +1,5 @@
 /* CustomSaleManager.h
-Copyright (c) 2023 by Hurleveur
+Copyright (c) 2024 by Hurleveur
 
 Endless Sky is free software: you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,7 @@ You should have received a copy of the GNU General Public License along with
 this program. If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CUSTOM_SALE_MANAGER_H_
-#define CUSTOM_SALE_MANAGER_H_
+#pragma once
 
 #include "CustomSale.h"
 
@@ -48,6 +47,3 @@ class CustomSaleManager {
 private:
 	static std::map<CustomSale::SellType, CustomSale> customSales;
 };
-
-#endif
-
diff --git a/source/OutfitterPanel.cpp b/source/OutfitterPanel.cpp
@@ -346,8 +346,7 @@ ShopPanel::BuyResult OutfitterPanel::CanBuy(bool onlyOwned) const
 	bool isInCargo = player.Cargo().Get(selectedOutfit);
 	bool isInStorage = player.Storage().Get(selectedOutfit);
 	bool isSold = CustomSaleManager::CanBuy(*selectedOutfit);
-	bool isInStore = (outfitter.Has(selectedOutfit) && isSold) ||
-		player.Stock(selectedOutfit) > 0;
+	bool isInStore = (outfitter.Has(selectedOutfit) && isSold) || player.Stock(selectedOutfit) > 0;
 	if(isInStorage && (onlyOwned || isInStore || playerShip))
 	{
 		// In storage, the outfit is certainly available to get,
@@ -573,8 +572,8 @@ void OutfitterPanel::Buy(bool onlyOwned)
 			else
 			{
 				// Check if the outfit is for sale or in stock so that we can actually buy it.
-				if((!outfitter.Has(selectedOutfit) && player.Stock(selectedOutfit) <= 0)
-						|| !CustomSaleManager::CanBuy(*selectedOutfit))
+				if((!outfitter.Has(selectedOutfit) && player.Stock(selectedOutfit) <= 0) ||
+									!CustomSaleManager::CanBuy(*selectedOutfit))
 					continue;
 				player.Cargo().Add(selectedOutfit);
 				int64_t price = player.StockDepreciation().Value(selectedOutfit, day);

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -55,7 +55,6 @@ list(APPEND INTEGRATION_TESTS
 	integration/config/plugins/integration-tests/data/tests/tests_capture_override.txt
 	integration/config/plugins/integration-tests/data/tests/tests_common.txt
 	integration/config/plugins/integration-tests/data/tests/tests_conditional_choice.txt
-	integration/config/plugins/integration-tests/data/tests/tests_custom_outfit_sale.txt
 	integration/config/plugins/integration-tests/data/tests/tests_disown.txt
 	integration/config/plugins/integration-tests/data/tests/tests_flagship_attribute_autoconditions.txt
 	integration/config/plugins/integration-tests/data/tests/tests_flagship_model_condition.txt

diff --git a/tests/integration/config/plugins/integration-tests/data/tests/tests_common.txt b/tests/integration/config/plugins/integration-tests/data/tests/tests_common.txt
@@ -704,39 +704,39 @@ test "Sell first outfit"
 	status partial
 	description "Test procedure that handles selling of the first outfit in the list."
 	sequence
-		# Goto outfitter
+		# Go to the outfitter.
 		input
 			key "o"
-		# Select the first item
+		# Select the first item.
 		input
 			key "Down"
-		# Sell the first item
+		# Sell the first item.
 		input
 			key "s"
 		# Go back to the planet menu.
 		input
-			key "l"
+			key "d"
 
 
 test "FailBuy first outfit"
 	status partial
 	description "Try to buy the first outfit and handle the case where it fails with an error dialog."
 	sequence
-		# Goto outfitter
+		# Go to the outfitter.
 		input
 			key "o"
-		# Select the first item
+		# Select the first item.
 		input
 			key "Down"
-		# Buy the first item
+		# Buy the first item.
 		input
 			key "b"
-		# Skip the error Message, if any
+		# Skip the error message, if any.
 		input
 			key "return"
 		# Go back to the planet menu.
 		input
-			key "l"
+			key "d"
 
 
 test "Land"
@@ -784,4 +784,3 @@ test "Skip Spaceport Mission"
 			key "Return"
 		input
 			key "Return"
-