diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 8d1acbcb..e5829b87 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -116,7 +116,7 @@ bool mmcollide(physent *d, float &hi, float &lo) // collide with a map entity &e = ents[i]; if(e.type==CLIP) { - const float r = max(float(e.attr2), 1.0f) + d->radius; + const float r = e.attr2 + d->radius; if(fabs(e.x-d->o.x)o.y)floor+e.attr1), ch = max(float(e.attr3), 1.0f); diff --git a/source/src/world.cpp b/source/src/world.cpp index 56f91635..8187d654 100644 --- a/source/src/world.cpp +++ b/source/src/world.cpp @@ -214,7 +214,7 @@ entity *newentity(int index, int x, int y, int z, char *what, int v1, int v2, in switch(type) { case CLIP: - if(v2<=0) e.attr2 = 1; + if(v2<0) e.attr2 = 0; if(v3<=0) e.attr3 = 1; break;