phantop
/
doukutsu-rs
mirror of https://github.com/doukutsu-rs/doukutsu-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

fix NPC hitboxes being calculated incorrectly

This commit is contained in:
Alula 2021-03-22 09:04:19 +01:00
parent 493ff3a0fb
commit 539af32722
No known key found for this signature in database
GPG Key ID: 3E00485503A1D8BA
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/physics.rs
View File

@ -42,7 +42,7 @@ pub trait PhysicalEntity {
fn player_right_pressed(&self) -> bool { false }
fn judge_hit_block(&mut self, state: &mut SharedGameState, x: i32, y: i32) {
let bounds_x = if self.is_player() { 5 } else { 8 };
let bounds_x = if self.is_player() { 5 } else { 5 };
let bounds_y = if self.is_player() { 4 } else { 5 };
// left wall
if (self.y() - self.hit_bounds().top as i32) < (y * 16 + bounds_y) * 0x200
@ -358,8 +358,8 @@ pub trait PhysicalEntity {
let hit_rect_size = clamp(self.hit_rect_size(), 1, 4);
let hit_rect_size = hit_rect_size * hit_rect_size;
let x = (self.x() + self.offset_x()) / (16 * 0x200);
let y = (self.y() + self.offset_y()) / (16 * 0x200);
let x = (self.x() + self.offset_x()) / (0x2000);
let y = (self.y() + self.offset_y()) / (0x2000);
self.flags().0 = 0;
for (idx, (&ox, &oy)) in OFF_X.iter().zip(OFF_Y.iter()).enumerate() {