浏览代码

Fix usage of std::bitset

Ivan Savenko 10 月之前
父节点
当前提交
3bbfee0e1c
共有 2 个文件被更改,包括 3 次插入5 次删除
  1. 1 3
      lib/battle/BattleHexArray.cpp
  2. 2 2
      lib/battle/BattleHexArray.h

+ 1 - 3
lib/battle/BattleHexArray.cpp

@@ -32,9 +32,7 @@ void BattleHexArray::insert(const BattleHexArray & other) noexcept
 
 void BattleHexArray::clear() noexcept
 {
-	for(const auto & hex : internalStorage)
-		presenceFlags[hex.toInt()] = false;
-
+	presenceFlags = {};
 	internalStorage.clear();
 }
 

+ 2 - 2
lib/battle/BattleHexArray.h

@@ -126,7 +126,7 @@ public:
 		// reinit presence flags
 		presenceFlags = {};
 		for(const auto & hex : internalStorage)
-			presenceFlags.set(hex.toInt()) = true;
+			presenceFlags.set(hex.toInt());
 	}
 
 	void shuffle(vstd::RNG & rand)
@@ -239,7 +239,7 @@ public:
 		if(!s.saving)
 		{
 			for(const auto & hex : internalStorage)
-				presenceFlags.set(hex.toInt()) = true;
+				presenceFlags.set(hex.toInt());
 		}
 	}