Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/easyrpg-player
/Player.app
/EasyRPG Player.app
*.a
*.elf
*.o
Expand All @@ -8,6 +9,7 @@
*.bak

# cmake
.cmake/
/Makefile
CMakeFiles/
CMakeScripts/
Expand All @@ -19,6 +21,17 @@ CPackSourceConfig.cmake
CTestTestfile.cmake
cmake_install.cmake
install_manifest.txt
.deps/
.dirstamp
.version-append
.version-git
aclocal.m4
autom4te.cache/
builds/autoconf/
config.h
config.h.in
config.status
stamp-h1

# msvc / Windows
*.vcxproj*
Expand Down
1 change: 1 addition & 0 deletions src/battle_animation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ void BattleAnimation::UpdateScreenFlash() {
}

void BattleAnimation::UpdateTargetFlash() {
if (Player::player_config.ignore_absent_battle_animation_flash.Get() && target_flash_timing == -1) return;
int r, g, b, p;
UpdateFlashGeneric(target_flash_timing, r, g, b, p);
FlashTargets(r, g, b, p);
Expand Down
2 changes: 2 additions & 0 deletions src/game_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ void Game_Config::LoadFromStream(Filesystem_Stream::InputStream& is) {
player.automatic_screenshots.FromIni(ini);
player.automatic_screenshots_interval.FromIni(ini);
player.prefer_easyrpg_map_files.FromIni(ini);
player.ignore_absent_battle_animation_flash.FromIni(ini);
}

void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
Expand Down Expand Up @@ -778,6 +779,7 @@ void Game_Config::WriteToStream(Filesystem_Stream::OutputStream& os) const {
player.automatic_screenshots.ToIni(os);
player.automatic_screenshots_interval.ToIni(os);
player.prefer_easyrpg_map_files.ToIni(os);
player.ignore_absent_battle_animation_flash.ToIni(os);

os << "\n";
}
1 change: 1 addition & 0 deletions src/game_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ struct Game_ConfigPlayer {
BoolConfigParam automatic_screenshots{ "Automatic screenshots", "Periodically take screenshots", "Player", "AutomaticScreenshots", false };
RangeConfigParam<int> automatic_screenshots_interval{ "Screenshot interval", "The interval between automatic screenshots (seconds)", "Player", "AutomaticScreenshotsInterval", 30, 1, 999999 };
BoolConfigParam prefer_easyrpg_map_files{ "Prefer EasyRPG map files", "Attempt to load EasyRPG map files (.emu) first and fall back to RPG Maker map files (.lmu)", "Player", "PreferEasyRpgMapFiles", true };
BoolConfigParam ignore_absent_battle_animation_flash{ "Ignore absent battle animation flash", "In RPG Maker, Battle Animations may override flashes on an event, even if the animation does not utilize flashes. Disables that behavior if true.", "Player", "IgnoreAbsentBattleAnimationFlash", false };

void Hide();
};
Expand Down
Loading