commit 046f9226b6b912cdb12dc3b35953aee7666f4b63
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Nov 2 23:36:10 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Nov 2 23:36:10 2008 +0000
Remove Hexen TIMEBOMB code.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1374
---
src/hexen/h2_main.c | 43 -------------------------------------------
src/hexen/h2def.h | 6 ------
src/hexen/mn_menu.c | 12 ------------
3 files changed, 61 deletions(-)
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index 15b6b1b6..ecc9832a 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -96,10 +96,6 @@ static void ExecOptionPLAYDEMO(char **args, int tag);
static void CreateSavePath(void);
static void WarpCheck(void);
-#ifdef TIMEBOMB
-static void DoTimeBomb(void);
-#endif
-
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
extern boolean automapactive;
@@ -260,10 +256,6 @@ void D_DoomMain(void)
// Now that the savedir is loaded from .CFG, make sure it exists
CreateSavePath();
-#ifdef TIMEBOMB
- DoTimeBomb();
-#endif
-
ST_Message("Z_Init: Init zone memory allocation daemon.\n");
Z_Init();
@@ -856,38 +848,3 @@ static void CreateSavePath(void)
M_MakeDirectory(SavePath);
}
-#ifdef TIMEBOMB
-//==========================================================================
-//
-// DoTimeBomb
-//
-//==========================================================================
-
-static void DoTimeBomb(void)
-{
-#ifdef __WATCOMC__
- time_t timeOfDay;
- struct tm timeBuffer;
-
- timeOfDay = time(NULL);
- _localtime(&timeOfDay, &timeBuffer);
- if (timeBuffer.tm_year != TIMEBOMB_YEAR
- || timeBuffer.tm_yday < TIMEBOMB_STARTDATE
- || timeBuffer.tm_yday > TIMEBOMB_ENDDATE)
- {
- I_Error("W_InitWadfiles: Wad file doesn't have IWAD or PWAD id\n");
- }
-
- printf
- ("\n===============================================================================\n");
- printf(" Hexen: Beyond Heretic\n\n");
- printf(" Beta -- Do Not Distribute!\n");
- printf(" Press any key to continue.\n");
- printf
- ("===============================================================================\n");
-
- getch();
- printf("\n");
-#endif
-}
-#endif
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index b1462adc..c0725ab3 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -59,12 +59,6 @@
#define HEXEN_VERSION 110
#define HEXEN_VERSION_TEXT "v1.1"
-// Uncomment, to enable all timebomb stuff
-//#define TIMEBOMB
-#define TIMEBOMB_YEAR 95 // years since 1900
-#define TIMEBOMB_STARTDATE 268 // initial date (9/26)
-#define TIMEBOMB_ENDDATE 301 // end date (10/29)
-
// if rangecheck is undefined, most parameter validation debugging code
// will not be compiled
#ifndef NORANGECHECKING
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index f7b34bc8..dee86f97 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -506,9 +506,6 @@ char *QuitEndMsg[] = {
"ARE YOU SURE YOU WANT TO SUICIDE?"
};
-
-#define BETA_FLASH_TEXT "BETA"
-
void MN_Drawer(void)
{
int i;
@@ -517,15 +514,6 @@ void MN_Drawer(void)
MenuItem_t *item;
char *selName;
-#ifdef TIMEBOMB
- // Beta blinker ***
- if (leveltime & 16)
- {
- MN_DrTextA(BETA_FLASH_TEXT,
- 160 - (MN_TextAWidth(BETA_FLASH_TEXT) >> 1), 12);
- }
-#endif // TIMEBOMB
-
if (MenuActive == false)
{
if (askforquit)