From ec71635ca13ace99068e0a664af9aa35e1566e9b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 22 Aug 2010 17:31:42 +0000 Subject: [PATCH] - fixed: The USDF CheckActorType function did not return the class object for ZDoom namespace. - fixed: The binary check for dialogue lumps must only rewind the file by 4 bytes, not completely to the start. SVN r2568 (trunk) --- src/p_conversation.cpp | 2 +- src/p_usdf.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 37739a43d2..96b00b1a5d 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -266,7 +266,7 @@ static bool LoadScriptFile(int lumpnum, FileReader *lump, int numnodes, bool inc char buffer[4]; lump->Read(buffer, 4); - lump->Seek(0, SEEK_SET); + lump->Seek(-4, SEEK_CUR); // The binary format is so primitive that this check is enough to detect it. bool isbinary = (buffer[0] == 0 || buffer[1] == 0 || buffer[2] == 0 || buffer[3] == 0); diff --git a/src/p_usdf.cpp b/src/p_usdf.cpp index 21bd8eeb3d..7bcca22043 100644 --- a/src/p_usdf.cpp +++ b/src/p_usdf.cpp @@ -71,6 +71,7 @@ class USDFParser : public UDMFParserBase sc.ScriptMessage("'%s' is not an actor type", key); return NULL; } + return cls; } return NULL; }