From 80d5ace673e97c32e02e3bf53b3bc27853f92b1f Mon Sep 17 00:00:00 2001 From: flan Date: Sat, 9 Aug 2025 15:45:45 +0200 Subject: [PATCH] Don't make other players flash on screen flash 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 9c203419af24ca1a770c1eb1efb23b2a36a0e50e. --- src/game_screen.cpp | 2 -- src/multiplayer/game_multiplayer.cpp | 7 ------- src/multiplayer/game_multiplayer.h | 1 - 3 files changed, 10 deletions(-) diff --git a/src/game_screen.cpp b/src/game_screen.cpp index f503e926e..cbc301cc4 100644 --- a/src/game_screen.cpp +++ b/src/game_screen.cpp @@ -119,8 +119,6 @@ void Game_Screen::FlashOnce(int r, int g, int b, int s, int frames) { data.flash_time_left = frames; data.flash_continuous = false; flash_period = 0; - - GMI().ApplyFlash(r, g, b, s, frames); } void Game_Screen::FlashBegin(int r, int g, int b, int s, int frames) { diff --git a/src/multiplayer/game_multiplayer.cpp b/src/multiplayer/game_multiplayer.cpp index 42725882a..ccd8688e9 100644 --- a/src/multiplayer/game_multiplayer.cpp +++ b/src/multiplayer/game_multiplayer.cpp @@ -738,13 +738,6 @@ void Game_Multiplayer::ApplyPlayerBattleAnimUpdates() { } } -void Game_Multiplayer::ApplyFlash(int r, int g, int b, int power, int frames) { - for (auto& p : players) { - p.second.ch->Flash(r, g, b, power, frames); - p.second.chat_name->SetFlashFramesLeft(frames); - } -} - void Game_Multiplayer::ApplyRepeatingFlashes() { for (auto& rf : repeating_flashes) { if (players.find(rf.first) != players.end()) { diff --git a/src/multiplayer/game_multiplayer.h b/src/multiplayer/game_multiplayer.h index dc52d7ed3..c3435c3a3 100644 --- a/src/multiplayer/game_multiplayer.h +++ b/src/multiplayer/game_multiplayer.h @@ -42,7 +42,6 @@ class Game_Multiplayer { bool IsBattleAnimSynced(int anim_id); void PlayerBattleAnimShown(int anim_id); void ApplyPlayerBattleAnimUpdates(); - void ApplyFlash(int r, int g, int b, int power, int frames); void ApplyRepeatingFlashes(); void ApplyTone(Tone tone); void ApplyScreenTone();