duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed more crashes in Caret

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2020-02-01 07:52:31 +01:00
parent aad200801c
commit 8042ab2c9b
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Caret.cpp
View file

@ -117,7 +117,10 @@ void ActCaret02(CARET *crt)
} }
if (crt->ani_no > 3) if (crt->ani_no > 3)
{
crt->cond = 0; crt->cond = 0;
return; // Avoid unconditional UB at rect_left[crt->ani_no]
}
crt->rect = rect_left[crt->ani_no]; crt->rect = rect_left[crt->ani_no];
break; break;
@ -130,7 +133,10 @@ void ActCaret02(CARET *crt)
} }
if (crt->ani_no > 3) if (crt->ani_no > 3)
{
crt->cond = 0; crt->cond = 0;
return; // Avoid unconditional UB at rect_right[crt->ani_no]
}
crt->rect = rect_right[crt->ani_no]; crt->rect = rect_right[crt->ani_no];
break; break;
@ -158,7 +164,10 @@ void ActCaret03(CARET *crt)
{ {
crt->ani_wait = 0; crt->ani_wait = 0;
if (++crt->ani_no > 3) if (++crt->ani_no > 3)
{
crt->cond = 0; crt->cond = 0;
return; // Return now, or the access to rect[crt->ani_no] we do is UB
}
} }
crt->rect = rect[crt->ani_no]; crt->rect = rect[crt->ani_no];
@ -207,12 +216,15 @@ void ActCaret05(CARET *crt)
++crt->ani_no; ++crt->ani_no;
} }
if (crt->ani_no > 6)
crt->cond = 0;
crt->x += 0x80; crt->x += 0x80;
crt->y -= 0x80; crt->y -= 0x80;
if (crt->ani_no > 6)
{
crt->cond = 0;
return; // Return now, or the access to rect[crt->ani_no] we do is UB
}
crt->rect = rect[crt->ani_no]; crt->rect = rect[crt->ani_no];
} }
@ -349,7 +361,10 @@ void ActCaret11(CARET *crt)
{ {
crt->ani_wait = 0; crt->ani_wait = 0;
if (++crt->ani_no > 6) if (++crt->ani_no > 6)
{
crt->cond = 0; crt->cond = 0;
return; // Avoid unconditional UB at rcRight[crt->ani_no]
}
} }
crt->rect = rcRight[crt->ani_no]; crt->rect = rcRight[crt->ani_no];
@ -366,7 +381,10 @@ void ActCaret12(CARET *crt)
{ {
crt->ani_wait = 0; crt->ani_wait = 0;
if (++crt->ani_no > 1) if (++crt->ani_no > 1)
{
crt->cond = 0; crt->cond = 0;
return; // Return now, or the access to rcLeft[crt->ani_no] we do is UB
}
} }
crt->rect = rcLeft[crt->ani_no]; crt->rect = rcLeft[crt->ani_no];