engine.c: fix clipmove() against floor-aligned sprites.

Introduced in r3207. Oops.

git-svn-id: https://svn.eduke32.com/eduke32@4873 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-12-30 20:05:22 +00:00
parent 5f263f1358
commit 2daa44ca6a
2 changed files with 2 additions and 6 deletions

View file

@ -13886,7 +13886,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
continue;
rxi[0] = x1;
rxi[1] = y1;
ryi[0] = y1;
get_floorspr_points(spr, 0, 0, &rxi[0], &rxi[1], &rxi[2], &rxi[3],
&ryi[0], &ryi[1], &ryi[2], &ryi[3]);

View file

@ -9670,11 +9670,7 @@ static int32_t parseconsounds(scriptfile *script)
}
g_sounds[sndnum].filename = (char *)Xcalloc(slen+1,sizeof(uint8_t));
// Hopefully noone does memcpy(..., g_sounds[].filename, BMAX_PATH)
if (!g_sounds[sndnum].filename)
{
Bfree(definedname);
return -1;
}
Bmemcpy(g_sounds[sndnum].filename, filename, slen+1);
if (scriptfile_getnumber(script, &ps)) goto BAD;