- Maps defined with Hexen-style MAPINFOs now run their scripts in the proper

order.


SVN r1565 (trunk)
This commit is contained in:
Randy Heit 2009-04-30 03:50:52 +00:00
parent f7d7e9faf9
commit 28e9693b79
3 changed files with 8 additions and 1 deletions

View file

@ -1,4 +1,6 @@
April 29, 2009 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 - 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 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 systems, it is a very large integer that is highly unlikely to be in mapped

View file

@ -1765,7 +1765,7 @@ static void C_PasteText(FString clip, BYTE *buffer, int len)
{ {
// Only paste the first line. // Only paste the first line.
long brk = clip.IndexOfAny("\r\n\b"); 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. // Make sure there's room for the whole thing.
if (buffer[0] + cliplen > len) if (buffer[0] + cliplen > len)

View file

@ -5955,6 +5955,11 @@ DLevelScript::DLevelScript (AActor *who, line_t *where, int num, const ScriptPtr
Link (); Link ();
if (level.flags2 & LEVEL2_HEXENHACK)
{
PutLast();
}
DPrintf ("Script %d started.\n", num); DPrintf ("Script %d started.\n", num);
} }