diff --git a/source/src/client.cpp b/source/src/client.cpp index 67f19724..c5f45e38 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -341,8 +341,9 @@ void addmsg(int type, const char *fmt, ...) } case 's': { - const char *t = va_arg(args, const char *); - if(t) sendstring(t, p); nums++; break; + sendstring(va_arg(args, const char*), p); + nums++; + break; } } va_end(args); diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 0d03c693..fe9c057c 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -82,7 +82,7 @@ bool plcollide(physent *d, physent *o, float &headspace, float &hi, float &lo) if((d->type==ENT_PLAYER && o->type==ENT_PLAYER ? dr.sqrxy() < r*r : fabs(dr.x)vel) >= 0.0f) { if(d->o.z-deyeheighto.z-oeyeheight) { if(o->o.z-oeyeheighto.z-oeyeheight-1; } - else if(o->o.z+o->aboveeye>lo) lo = o->o.z+o->aboveeye+1; + else if(o->o.z+o->aboveeye>lo) lo = o->o.z+o->aboveeye; if(fabs(o->o.z-d->o.z)aboveeye+deyeheight) { hitplayer = o; return true; } headspace = d->o.z-o->o.z-o->aboveeye-deyeheight;