From bf5e84859e2aca7f543f88a4a93bb971332aa989 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 1 Oct 2008 17:31:28 +0000 Subject: Merge Hexen fixed_t and angle definitions to common code, plus byte swapping macros, bounding box checking, read/write file, screenshot and command line argument code. Update Heretic code to use ANG1_X rather than the new (correct) ANG1 definition. Subversion-branch: /branches/raven-branch Subversion-revision: 1311 --- src/hexen/sc_man.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'src/hexen/sc_man.c') diff --git a/src/hexen/sc_man.c b/src/hexen/sc_man.c index 418c88af..63afb3cb 100644 --- a/src/hexen/sc_man.c +++ b/src/hexen/sc_man.c @@ -27,6 +27,7 @@ #include #include #include "h2def.h" +#include "m_misc.h" // MACROS ------------------------------------------------------------------ @@ -35,7 +36,6 @@ #define ASCII_QUOTE (34) #define LUMP_SCRIPT 1 #define FILE_ZONE_SCRIPT 2 -#define FILE_CLIB_SCRIPT 3 // TYPES ------------------------------------------------------------------- @@ -122,20 +122,6 @@ void SC_OpenFile(char *name) OpenScript(name, FILE_ZONE_SCRIPT); } -//========================================================================== -// -// SC_OpenFileCLib -// -// Loads a script (from a file) and prepares it for parsing. Uses C -// library function calls for memory allocation and de-allocation. -// -//========================================================================== - -void SC_OpenFileCLib(char *name) -{ - OpenScript(name, FILE_CLIB_SCRIPT); -} - //========================================================================== // // OpenScript @@ -158,12 +144,6 @@ static void OpenScript(char *name, int type) M_ExtractFileBase(name, ScriptName); ScriptFreeCLib = false; // De-allocate using Z_Free() } - else - { // File script - clib - ScriptSize = M_ReadFileCLib(name, (byte **) & ScriptBuffer); - M_ExtractFileBase(name, ScriptName); - ScriptFreeCLib = true; // De-allocate using free() - } ScriptPtr = ScriptBuffer; ScriptEndPtr = ScriptPtr + ScriptSize; sc_Line = 1; -- cgit v1.2.3