diff --git a/bin/back b/bin/back index 4321870..b5e2676 100755 Binary files a/bin/back and b/bin/back differ diff --git a/levels/level_02/room_0 b/levels/level_02/room_0 index 54f1d21..2335288 100644 --- a/levels/level_02/room_0 +++ b/levels/level_02/room_0 @@ -88,7 +88,7 @@ Entities: [-14.0, 21.0, 14.0, 2.0, 1.0, 2.0, 0.0, 0.0, 192, 192, 192, 1, 0, 4, 5.0, 0.0, 4.0, 3, 7, 0] // button part [-18.0, 22.0, 14.0, 2.0, 1.0, 2.0, 0.0, 0.0, 192, 192, 192, 1, 0, 4, 5.0, 0.0, -4.0, 3, 7, 90] [ -4.0, 20.0,-14.0, 2.0, 2.0, 14.0, 0.0, 0.0, 192, 192, 192, 1, 0, 12, 1, 0] -[-33.0, 24.0, 18.0, 2.0, 2.0, 2.0, 0.71, 0.0, 92, 92, 92, 1, 0, 11, 1, 10.0] +[-33.0, 24.0, 18.0, 2.0, 2.0, 2.0, 0.71, 0.0, 92, 92, 92, 1, 0, 11, 1, 30.0] [-5.0, 20.0, -18.0, 4.0, 2.0, 2.0, 0.0, 0.0, 192, 192, 192, 1, 0, 4, 10.0, 0.0, 0.0, 3, 4, 0, {1, 1}] // 3 - platforms diff --git a/levels/level_03/room_0 b/levels/level_03/room_0 index 98c1bd2..cec2fed 100644 --- a/levels/level_03/room_0 +++ b/levels/level_03/room_0 @@ -19,7 +19,8 @@ Blocks: Entities: -[-4.0, 4.0, -0.5, 4.0, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 0.0, 25.0, 0.0, 0.0, 2.0, 0] +[-5.5, 4.0, -0.5, 2.5, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 0.0, 25.0, 0.0, 0.0, 2.0, 0] +[-1.0, 4.0, -0.5, 2.5, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 0.0, -25.0, 0.0, 0.0, 2.0, 0] [-16.0, 0.0, -16.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 192, 1, 0, 6, yeet, 255, 255, 255] [12.0, 0.0, 12.0, 4.0, 4.0, 4.0, 0.0, 0.0, 255, 255, 255, 1, 0, 8, 200, 1, 64, 64, 64] diff --git a/obj/entities.o b/obj/entities.o index fd9027d..21d018b 100644 Binary files a/obj/entities.o and b/obj/entities.o differ diff --git a/src/entities.c b/src/entities.c index 66dff2e..f728491 100644 --- a/src/entities.c +++ b/src/entities.c @@ -356,9 +356,9 @@ void movCrateButton_postStep(double x, double y, double z, double w, double h, d void movableCrate_onHit(float dtime, int* hp, int* dmg, entity* ent, cube_0* ret) { //printf("(+%lf, +%lf)\n", camvx, camvz); - entToVelCheck = ent; - doUpdateEntVel = true; - //updateF_movableCrate(ret, (double)dtime, ent); + //entToVelCheck = ent; + //doUpdateEntVel = true; + updateF_movableCrate(ret, (double)dtime, ent); } void lava_onHit(float dtime, int* hp, int* dmg, entity* ent, cube_0* ret) {