Sfoglia il codice sorgente

Fix compilation on Mac M1 (#7582)

Fixes #7557

Thanks to @vietlubu
Lemongrass3110 2 anni fa
parent
commit
59a722234d
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 3 3
      src/map/cashshop.cpp
  2. 1 1
      src/map/cashshop.hpp

+ 3 - 3
src/map/cashshop.cpp

@@ -47,7 +47,7 @@ uint64 CashShopDatabase::parseBodyNode( const ryml::NodeRef& node ){
 
 	e_cash_shop_tab tab = static_cast<e_cash_shop_tab>( constant );
 
-	std::shared_ptr<s_cash_item_tab> entry = this->find( tab );
+	std::shared_ptr<s_cash_item_tab> entry = this->find( static_cast<uint16>( tab ) );
 	bool exists = entry != nullptr;
 
 	if( !exists ){
@@ -113,14 +113,14 @@ uint64 CashShopDatabase::parseBodyNode( const ryml::NodeRef& node ){
 	}
 
 	if( !exists ){
-		this->put( tab, entry );
+		this->put( static_cast<uint16>( tab ), entry );
 	}
 
 	return 1;
 }
 
 std::shared_ptr<s_cash_item> CashShopDatabase::findItemInTab( e_cash_shop_tab tab, t_itemid nameid ){
-	std::shared_ptr<s_cash_item_tab> cash_tab = this->find( tab );
+	std::shared_ptr<s_cash_item_tab> cash_tab = this->find( static_cast<uint16>( tab ) );
 
 	if( cash_tab == nullptr ){
 		return nullptr;

+ 1 - 1
src/map/cashshop.hpp

@@ -63,7 +63,7 @@ struct s_cash_item_tab{
 	std::vector<std::shared_ptr<s_cash_item>> items;
 };
 
-class CashShopDatabase : public TypesafeYamlDatabase<e_cash_shop_tab, s_cash_item_tab>{
+class CashShopDatabase : public TypesafeYamlDatabase<uint16, s_cash_item_tab>{
 public:
 	CashShopDatabase() : TypesafeYamlDatabase( "ITEM_CASH_DB", 1 ){