Skip to content

Two small edge cases in the pnj osd #346

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
RegularFriend wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Open

Two small edge cases in the pnj osd #346

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
13 changes: 13 additions & 0 deletions src/osds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,25 @@ static void RunOsd_PnJ(GOBJ *ft, GOBJ *ft_sub) {
if (!ft || !ft_sub) return;
const FighterData *ft_data = ft->userdata;
const FighterData *ft_sub_data = ft_sub->userdata;
//if nana is dead return
if (ft_sub_data->flags.dead) return;
if (ft_data->kind != FTKIND_POPO) return;


bool pivot_was_active = pivot_frames[ft_data->ply] != 0;

//SUCCESSFUL AND LATE PNJ DETECTION
if (pivot_frames[ft_data->ply] != 0) {

//if nana is disconnected, reset and return. avoids false positives where a disconnect nana
//happens to jump on the same frame a pnj could occur
//isCopy flag documented in fighter.h:1325
const int CPU_FLAG_ISCOPY = 0x100;
if (!(ft_sub_data->cpu.xf8 & CPU_FLAG_ISCOPY)) {
pivot_frames[ft_data->ply] = 0;
jump_frames[ft_data->ply] = 0;
return;
}
const int late_pnj_window = 4;
const int timeout = 6 + late_pnj_window;
//timeout.
Expand Down