Skip to content

Don't treat two different consecutive flashes as repeating #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsdko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't treat two different consecutive flashes as repeating #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/multiplayer/game_multiplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ static bool MovePlayerToPos(Game_PlayerOther& player, int x, int y) {
}

void Game_Multiplayer::ResetRepeatingFlash() {
repeating_flash_active = false;
frame_index = 0;
last_flash_frame_index = -1;
last_frame_flash.reset();
last_flash_frame_flash.fill(0);
repeating_flashes.clear();
}

Expand Down Expand Up @@ -593,16 +594,16 @@ void Game_Multiplayer::MainPlayerFlashed(int r, int g, int b, int p, int f) {
std::array<int, 5> flash_array = std::array<int, 5>{ r, g, b, p, f };
if (last_flash_frame_index > -1
&& frame_index - last_flash_frame_index <= 1
&& (last_frame_flash.get() == nullptr || *last_frame_flash == flash_array)) {
if (last_frame_flash.get() == nullptr) {
last_frame_flash = std::make_unique<std::array<int, 5>>(flash_array);
&& last_flash_frame_flash == flash_array) {
if (!repeating_flash_active) {
repeating_flash_active = true;
connection.SendPacketAsync<RepeatingFlashPacket>(r, g, b, p, f);
}
} else {
connection.SendPacketAsync<FlashPacket>(r, g, b, p, f);
last_frame_flash.reset();
}
last_flash_frame_index = frame_index;
last_flash_frame_flash = flash_array;
}

void Game_Multiplayer::MainPlayerChangedTransparency(int transparency) {
Expand Down Expand Up @@ -804,12 +805,11 @@ void Game_Multiplayer::UpdateServerVariables() {

void Game_Multiplayer::Update() {
if (session_active) {
if (last_flash_frame_index > -1
&& last_frame_flash.get() != nullptr
&& frame_index > last_flash_frame_index) {
if (repeating_flash_active && frame_index > last_flash_frame_index) {
connection.SendPacketAsync<RemoveRepeatingFlashPacket>();
repeating_flash_active = false;
last_flash_frame_index = -1;
last_frame_flash.reset();
last_flash_frame_flash.fill(0);
}

++frame_index;
Expand Down
3 changes: 2 additions & 1 deletion src/multiplayer/game_multiplayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ class Game_Multiplayer {
std::vector<std::string> global_sync_picture_prefixes;
std::map<int, bool> sync_picture_cache;
std::vector<int> sync_battle_anim_ids;
bool repeating_flash_active;
int last_flash_frame_index{-1};
std::unique_ptr<std::array<int, 5>> last_frame_flash;
std::array<int, 5> last_flash_frame_flash;
std::map<int, std::array<int, 5>> repeating_flashes;

std::unordered_set<std::string> hrs_set{
Expand Down
Loading