Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Regression] Fix conditional branches in CShots::hittest_pellet() 

1 wrong byte of ASM that slipped through due to a off-by-one error in
an experimental mzdiff branch. Having MOV rather than LES here was
ultimately a harmless mistake though. In context, it's even covered by
the "identical instruction encoding" exception 🙂
This commit is contained in:
nmlgc 2020-06-25 17:26:53 +02:00
parent ed4d7282a0
commit f03f43db3a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
th01/main/player/shots.cpp
View File

@ -129,9 +129,11 @@ bool16 CShots::hittest_pellet(int pellet_left, int pellet_top)
if(moving[i] == false) {
continue;
}
if(decay_frame[i] == 1) {
continue;
}
if(
decay_frame[i] != true
&& ((left[i] - pellet_left) <= ((SHOT_W / 2) - SHOT_SPRITE_MARGIN))
((left[i] - pellet_left) <= ((SHOT_W / 2) - SHOT_SPRITE_MARGIN))
&& ((left[i] - pellet_left) >= -(SHOT_H - SHOT_SPRITE_MARGIN))
&& ((top[i] - pellet_top) <= ((SHOT_W / 2) - SHOT_SPRITE_MARGIN))
&& ((top[i] - pellet_top) >= -(SHOT_H - SHOT_SPRITE_MARGIN))