From 28e9693b7979ff692cfc22d4ded65d589f2b1f44 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Thu, 30 Apr 2009 03:50:52 +0000 Subject: [PATCH] - Maps defined with Hexen-style MAPINFOs now run their scripts in the proper order. SVN r1565 (trunk) --- docs/rh-log.txt | 2 ++ src/c_console.cpp | 2 +- src/p_acs.cpp | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index cc083c88a..060185b4f 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ April 29, 2009 +- Maps defined with Hexen-style MAPINFOs now run their scripts in the proper + order. - Fixed: FWadCollection::CheckNumForName() read the lump each iteration before checking for the end marker. On 32-bit systems, this is -1, but on 64-bit systems, it is a very large integer that is highly unlikely to be in mapped diff --git a/src/c_console.cpp b/src/c_console.cpp index 164a98a61..07f05fa32 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -1765,7 +1765,7 @@ static void C_PasteText(FString clip, BYTE *buffer, int len) { // Only paste the first line. long brk = clip.IndexOfAny("\r\n\b"); - int cliplen = brk >= 0 ? brk : clip.Len(); + int cliplen = brk >= 0 ? brk : (int)clip.Len(); // Make sure there's room for the whole thing. if (buffer[0] + cliplen > len) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 34845098a..fa9a66136 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -5955,6 +5955,11 @@ DLevelScript::DLevelScript (AActor *who, line_t *where, int num, const ScriptPtr Link (); + if (level.flags2 & LEVEL2_HEXENHACK) + { + PutLast(); + } + DPrintf ("Script %d started.\n", num); }