Skip to content

Commit b998167

Browse files
authored
Don't make other players flash on screen flash (#72)
It makes no visual difference now that player names are affected by screen flashes. Fixes PlayerOther flickering in MAP2059 (Sunset Savannah, Yume 2kki) seen during the event triggered by using the Fairy effect. Regression introduced in 9c20341.
1 parent 1a32458 commit b998167

3 files changed

Lines changed: 0 additions & 10 deletions

File tree

src/game_screen.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ void Game_Screen::FlashOnce(int r, int g, int b, int s, int frames) {
119119
data.flash_time_left = frames;
120120
data.flash_continuous = false;
121121
flash_period = 0;
122-
123-
GMI().ApplyFlash(r, g, b, s, frames);
124122
}
125123

126124
void Game_Screen::FlashBegin(int r, int g, int b, int s, int frames) {

src/multiplayer/game_multiplayer.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -738,13 +738,6 @@ void Game_Multiplayer::ApplyPlayerBattleAnimUpdates() {
738738
}
739739
}
740740

741-
void Game_Multiplayer::ApplyFlash(int r, int g, int b, int power, int frames) {
742-
for (auto& p : players) {
743-
p.second.ch->Flash(r, g, b, power, frames);
744-
p.second.chat_name->SetFlashFramesLeft(frames);
745-
}
746-
}
747-
748741
void Game_Multiplayer::ApplyRepeatingFlashes() {
749742
for (auto& rf : repeating_flashes) {
750743
if (players.find(rf.first) != players.end()) {

src/multiplayer/game_multiplayer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class Game_Multiplayer {
4242
bool IsBattleAnimSynced(int anim_id);
4343
void PlayerBattleAnimShown(int anim_id);
4444
void ApplyPlayerBattleAnimUpdates();
45-
void ApplyFlash(int r, int g, int b, int power, int frames);
4645
void ApplyRepeatingFlashes();
4746
void ApplyTone(Tone tone);
4847
void ApplyScreenTone();

0 commit comments

Comments
 (0)