From 9949a3cf5cd470fc9bb928921b4a4ecb4d0936a6 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 18 Jan 2018 04:28:55 +0000 Subject: [PATCH] When SE 17 can't find the next sector for the floor, use the heuristic added for ceilings in r3013 to determine the floorz, replacing the game exit added in r2971. git-svn-id: https://svn.eduke32.com/eduke32@6582 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/game.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index b34be2224..cd5203c5d 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -2964,10 +2964,11 @@ int A_Spawn(int spriteNum, int tileNum) T5(newSprite) = sector[nextSectNum].floorz; else { - // XXX: we should return to the menu for this and similar failures - Bsprintf(tempbuf, "SE 17 (warp elevator) setup failed: sprite %d at (%d, %d)", newSprite, - TrackerCast(sprite[newSprite].x), TrackerCast(sprite[newSprite].y)); - G_GameExit(tempbuf); + // heuristic + T5(newSprite) = sector[sectNum].floorz; + + OSD_Printf(OSD_ERROR "WARNING: SE17 sprite %d using own sector %d's floorz.\n", + newSprite, sectNum); } if (numplayers < 2 && !g_netServer)