summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2008-10-01 19:14:51 +0000
committerSimon Howard2008-10-01 19:14:51 +0000
commit313e56805e28ff78868dce3806c813bc1e98d16b (patch)
tree571ee55218ee848f9d4353717e0a035b504277ca /src
parent16e361951eb7bce9726e4a96699429f2883bd68c (diff)
downloadchocolate-doom-313e56805e28ff78868dce3806c813bc1e98d16b.tar.gz
chocolate-doom-313e56805e28ff78868dce3806c813bc1e98d16b.tar.bz2
chocolate-doom-313e56805e28ff78868dce3806c813bc1e98d16b.zip
Remove some duplicate definitions from h2def.h.
Subversion-branch: /branches/raven-branch Subversion-revision: 1318
Diffstat (limited to 'src')
-rw-r--r--src/hexen/h2_main.c14
-rw-r--r--src/hexen/h2def.h5
2 files changed, 0 insertions, 19 deletions
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index 64af338e..25f04aa5 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -86,7 +86,6 @@ static void ExecOptionFILE(char **args, int tag);
static void ExecOptionSCRIPTS(char **args, int tag);
static void ExecOptionSKILL(char **args, int tag);
static void ExecOptionPLAYDEMO(char **args, int tag);
-static void ExecOptionMAXZONE(char **args, int tag);
static void CreateSavePath(void);
static void WarpCheck(void);
@@ -142,7 +141,6 @@ static execOpt_t ExecOptions[] = {
{"-skill", ExecOptionSKILL, 1, 0},
{"-playdemo", ExecOptionPLAYDEMO, 1, 0},
{"-timedemo", ExecOptionPLAYDEMO, 1, 0},
- {"-maxzone", ExecOptionMAXZONE, 1, 0},
{NULL, NULL, 0, 0} // Terminator
};
@@ -464,18 +462,6 @@ long superatol(char *s)
}
-static void ExecOptionMAXZONE(char **args, int tag)
-{
- int size;
-
- size = superatol(args[1]);
- if (size < MINIMUM_HEAP_SIZE)
- size = MINIMUM_HEAP_SIZE;
- if (size > MAXIMUM_HEAP_SIZE)
- size = MAXIMUM_HEAP_SIZE;
- maxzone = size;
-}
-
//==========================================================================
//
// H2_GameLoop
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index 82993815..41e8043d 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -103,11 +103,6 @@ extern byte *destview, *destscreen; // PC direct to screen pointers
//#define NUMARTIFCTS 28
#define MAXPLAYERS 8
-#define TICRATE 35 // number of tics / second
-#define TICSPERSEC 35
-
-#define MINIMUM_HEAP_SIZE 0x800000 // 8 meg
-#define MAXIMUM_HEAP_SIZE 0x2000000 // 32 meg
typedef unsigned int uint;