restrict fixed flip to Normal and Initiative battle types

EasyRPG · Sep 20, 2023 · ac9cddf · ac9cddf
1 parent d93923f
commit ac9cddf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/sprite_actor.cpp b/src/sprite_actor.cpp
@@ -29,12 +29,14 @@
 #include <lcf/reader_util.h>
 #include "output.h"
 #include "feature.h"
+#include "game_battle.h"
 
 Sprite_Actor::Sprite_Actor(Game_Actor* actor)
 	: Sprite_Battler(actor, actor->GetId())
 {
 	CreateSprite();
-	if (Feature::HasFixedActorFacingDirection()) {
+	auto condition = Game_Battle::GetBattleCondition();
+	if ((condition == lcf::rpg::System::BattleCondition_none || condition == lcf::rpg::System::BattleCondition_initiative) && Feature::HasFixedActorFacingDirection()) {
 		fixed_facing = static_cast<FixedFacing>(lcf::Data::battlecommands.easyrpg_fixed_actor_facing_direction);
 	}
 }

diff --git a/src/sprite_enemy.cpp b/src/sprite_enemy.cpp
@@ -27,12 +27,14 @@
 #include <lcf/reader_util.h>
 #include "output.h"
 #include "feature.h"
+#include "game_battle.h"
 
 Sprite_Enemy::Sprite_Enemy(Game_Enemy* enemy)
 	: Sprite_Battler(enemy, enemy->GetTroopMemberId())
 {
 	CreateSprite();
-	if (Feature::HasFixedEnemyFacingDirection()) {
+	auto condition = Game_Battle::GetBattleCondition();
+	if ((condition == lcf::rpg::System::BattleCondition_none || condition == lcf::rpg::System::BattleCondition_initiative) && Feature::HasFixedEnemyFacingDirection()) {
 		fixed_facing = static_cast<FixedFacing>(lcf::Data::battlecommands.easyrpg_fixed_enemy_facing_direction);
 	}
 }