Merge branch 'master' into feature/controller

This commit is contained in:
Alula 2020-12-07 00:48:23 +01:00
commit 6b6e43b7f9
No known key found for this signature in database
GPG Key ID: 3E00485503A1D8BA
2 changed files with 3 additions and 1 deletions

View File

@ -605,7 +605,7 @@ impl PhysicalEntity for Bullet {
let mut npc = NPCMap::create_npc(4, &state.npc_table);
npc.cond.set_alive(true);
npc.direction = Direction::Left;
npc.x = (x * 16 + 8) * 0x200;sta
npc.x = (x * 16 + 8) * 0x200;
npc.y = (y * 16 + 8) * 0x200;
for _ in 0..4 {

View File

@ -1,3 +1,5 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
fn main() {
doukutsu_rs::init().unwrap();
}