From 2daa44ca6a88dfabeb48d973ad100e7cca3c1612 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 30 Dec 2014 20:05:22 +0000
Subject: [PATCH] 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
---
 polymer/eduke32/build/src/engine.c | 2 +-
 polymer/eduke32/source/astub.c     | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index e6256b7a0..8754e2603 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -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]);
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 1cc97122d..113f70b92 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -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;