From 9ae0ab9413241f4907e08c5030f63e5308b3490c Mon Sep 17 00:00:00 2001 From: Wintermate Date: Sun, 20 Oct 2013 04:21:31 +0200 Subject: [PATCH 1/1] =?utf8?q?Level-Load:=20Gegner=20besser=20positioniere?= =?utf8?q?n.=20Au=C3=9Ferdem=20leere=20Source-Datei=20entfernt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- badge/jumpnrun/enemies.c | 4 ++-- badge/jumpnrun/level_load.c | 4 ++-- badge/jumpnrun/moveable.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 badge/jumpnrun/moveable.c diff --git a/badge/jumpnrun/enemies.c b/badge/jumpnrun/enemies.c index 744e2f9..61859a8 100644 --- a/badge/jumpnrun/enemies.c +++ b/badge/jumpnrun/enemies.c @@ -517,8 +517,8 @@ jumpnrun_enemy_type const jumpnrun_enemy_type_data[JUMPNRUN_ENEMY_TYPE_COUNT] = .animation_ticks_per_frame = 6, .animation_length = ARRAY_SIZE(anim_spiral), .animation_frames = anim_spiral, - .hitbox = { { FIXED_INT_I(0), FIXED_INT_I(0) }, - { FIXED_INT_I(10), FIXED_INT_I(10) } }, + .hitbox = { { FIXED_INT_I(1), FIXED_INT_I(1) }, + { FIXED_INT_I(8), FIXED_INT_I(8) } }, .spawn_inertia = { FIXED_INT_I(0), FIXED_POINT_I(0, -200) }, .collision_tiles = enemy_collision_tiles_pass_through, .collision_player = enemy_collision_player_deadly, diff --git a/badge/jumpnrun/level_load.c b/badge/jumpnrun/level_load.c index 4b1e499..bcdb390 100644 --- a/badge/jumpnrun/level_load.c +++ b/badge/jumpnrun/level_load.c @@ -51,8 +51,8 @@ static void jumpnrun_level_make_enemy(jumpnrun_enemy *dest, level_thing thing) { dest->type = &jumpnrun_enemy_type_data[thing.type]; - dest->spawn_pos.x = FIXED_POINT( thing.x * JUMPNRUN_TILE_PIXEL_WIDTH , 0); - dest->spawn_pos.y = FIXED_POINT((thing.y + 1) * JUMPNRUN_TILE_PIXEL_HEIGHT - dest->type->animation_frames[0].height, 0); + dest->spawn_pos.x = FIXED_POINT( thing.x * JUMPNRUN_TILE_PIXEL_WIDTH + fixed_point_cast_int(dest->type->hitbox.pos.x), 0); + dest->spawn_pos.y = FIXED_POINT((thing.y + 1) * JUMPNRUN_TILE_PIXEL_HEIGHT - dest->type->animation_frames[0].height , 0); jumpnrun_enemy_despawn(dest); } diff --git a/badge/jumpnrun/moveable.c b/badge/jumpnrun/moveable.c deleted file mode 100644 index 26789d3..0000000 --- a/badge/jumpnrun/moveable.c +++ /dev/null @@ -1 +0,0 @@ -#include "moveable.h" -- 2.20.1