From 86e7a97ef7eb3cca8d49019024c1dd8a82df164c Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 17 Jan 2015 00:27:46 +0000
Subject: [PATCH] Fix a crash exposed by animating the menu back button.

git-svn-id: https://svn.eduke32.com/eduke32@4927 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/engine.c | 8 ++++++--
 polymer/eduke32/source/menus.c     | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 223c4259e..506ad2125 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -7552,9 +7552,13 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
 
     // bound clipping rectangle to screen
     if (cx1 < 0) cx1 = 0;
+    else if (cx1 > xres-1) cx1 = xres-1;
     if (cy1 < 0) cy1 = 0;
-    if (cx2 > xres-1) cx2 = xres-1;
-    if (cy2 > yres-1) cy2 = yres-1;
+    else if (cy1 > yres-1) cy1 = yres-1;
+    if (cx2 < 0) cx2 = 0;
+    else if (cx2 > xres-1) cx2 = xres-1;
+    if (cy2 < 0) cy2 = 0;
+    else if (cy2 > yres-1) cy2 = yres-1;
 
     xsiz = tilesiz[picnum].x;
     ysiz = tilesiz[picnum].y;
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 63c08fc85..07726ce69 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -4137,7 +4137,6 @@ static void M_RunMenu_MouseReturn(Menu_t *cm, const vec2_t origin)
                   M_RunMenuInput_MouseReturn_status ? 4 - (sintable[(totalclock << 4) & 2047] >> 11) : 6, 0,
                   2 | 8 | 16 | RS_ALIGN_L, MOUSEALPHA, 0, xdim_from_320_16(origin.x + x_widescreen_left()), 0,
                   xdim_from_320_16(origin.x + x_widescreen_left() + (tilesiz[SELECTDIR].y << 15)), ydim - 1);
-    ;
 }
 #endif