fixed player not being able to push crates
This commit is contained in:
parent
bc4560b2fd
commit
f09196df7f
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
BIN
obj/entities.o
BIN
obj/entities.o
Binary file not shown.
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue