Merge pull request #2323 from rueter37/issue-2266

Fix HSL to RGB overflow error
EasyRPG · Sep 10, 2020 · db99af4 · db99af4
2 parents 57f6c63 + 66e1fd0
commit db99af4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/bitmap_hslrgb.h b/src/bitmap_hslrgb.h
@@ -56,7 +56,7 @@ static inline void HSL_to_RGB(const int& h, const int& s, const int& l,
 
 static inline void HSL_adjust(int& h, int& s, int& l, int hue) {
 	h += hue;
-	if (h > 0x600) h -= 0x600;
+	if (h >= 0x600) h -= 0x600;
 	if (s > 0xFF) s = 0xFF;
 	l = (l > 0xFF) ? 0xFF : (l < 0) ? 0 : l;
 }

diff --git a/src/scene_battle_rpg2k3.cpp b/src/scene_battle_rpg2k3.cpp
@@ -1486,7 +1486,7 @@ void Scene_Battle_Rpg2k3::ShowNotification(std::string text) {
 
 bool Scene_Battle_Rpg2k3::CheckAnimFlip(Game_Battler* battler) {
 	if (Game_System::GetInvertAnimations()) {
-		return battler->IsDirectionFlipped() ^ battler->GetType() == Game_Battler::Type_Enemy;
+		return battler->IsDirectionFlipped() ^ (battler->GetType() == Game_Battler::Type_Enemy);
 	}
 	return false;
 }