summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2010-01-11 23:58:05 +0100
committerBardur Arantsson <bardur@scientician.net>2010-01-12 00:06:50 +0100
commit81d753f9f8bb79b221421076c629abd3dd873cc8 (patch)
treeff8a69c2d9d3033b4aaf8a538af0070593cc1e1a /src
parent6ce1c07d3493add43a2ddea81bcc96b249b58892 (diff)
Remove ALLOW_SPOILERS option.
Diffstat (limited to 'src')
-rw-r--r--src/config.h5
-rw-r--r--src/wizard1.c71
-rw-r--r--src/wizard2.c7
3 files changed, 1 insertions, 82 deletions
diff --git a/src/config.h b/src/config.h
index 40f198d6..d14a499f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -153,11 +153,6 @@
/*
- * OPTION: Hack -- Compile in support for "Spoiler Generation"
- */
-#define ALLOW_SPOILERS
-
-/*
* OPTION: Allow characteres to be "auto-rolled"
*/
#define ALLOW_AUTOROLLER
diff --git a/src/wizard1.c b/src/wizard1.c
index 066e5d20..44b154a3 100644
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -5,9 +5,6 @@
#include "angband.h"
-#ifdef ALLOW_SPOILERS
-
-
/*
* The spoiler file being created
*/
@@ -1165,21 +1162,13 @@ static void print_header(void)
static void spoiler_print_art(obj_desc_list *art_ptr, int name1, int set, object_type *o_ptr)
{
/* Don't indent the first line */
-#if 0 // DGDGDGDG
- fprintf(fff, "<P>%s<BR>", art_ptr->description);
-#else
-fprintf(fff, "%s\n ", art_ptr->description);
-#endif
+ fprintf(fff, "%s\n ", art_ptr->description);
text_out_indent = 4;
object_out_desc(o_ptr, fff, FALSE, TRUE);
text_out_indent = 0;
/* End with the miscellaneous facts */
-#if 0 // DGDGDGDG
- fprintf(fff, "<BR>%s</P>", art_ptr->misc_desc);
-#else
fprintf(fff, "%s%s\n\n", INDENT1, art_ptr->misc_desc);
-#endif
}
@@ -1209,17 +1198,6 @@ static bool make_fake_artifact(object_type *o_ptr, int name1)
/* Save the name */
o_ptr->name1 = name1;
- /* Extract the fields */
-#if 0
- o_ptr->pval = a_ptr->pval;
- o_ptr->ac = a_ptr->ac;
- o_ptr->dd = a_ptr->dd;
- o_ptr->ds = a_ptr->ds;
- o_ptr->to_a = a_ptr->to_a;
- o_ptr->to_h = a_ptr->to_h;
- o_ptr->to_d = a_ptr->to_d;
- o_ptr->weight = a_ptr->weight;
-#else
/* Keep the One Ring untouched by apply_magic */
if (name1 != ART_POWER)
{
@@ -1231,7 +1209,6 @@ static bool make_fake_artifact(object_type *o_ptr, int name1)
{
o_ptr->pval = a_ptr->pval;
}
-#endif
/* Success */
return (TRUE);
@@ -1269,9 +1246,6 @@ static void spoil_artifact(cptr fname)
return;
}
-#if 0 // DGDGDGDG
- fprintf(fff, "<HTML><BODY BGCOLOR=#000000 TEXT=#CCCCCC>");
-#endif
/* Dump the header */
print_header();
@@ -1317,9 +1291,6 @@ static void spoil_artifact(cptr fname)
}
}
-#if 0 // DGDGDGDG
- fprintf(fff, "</BODY></HTML>");
-#endif
/* Check for errors */
if (ferror(fff) || my_fclose(fff))
{
@@ -2353,37 +2324,6 @@ static void spoil_mon_info(cptr fname)
msg_print("Successfully created a spoiler file.");
}
-#if 0 /* not used anymore -- masmarangio */
-static char* get_tval_name(int tval)
-{
- switch (tval)
- {
- case TV_SWORD:
- return "Sword";
- case TV_POLEARM:
- return "Polearm";
- case TV_HAFTED:
- return "Hafted";
- case TV_AXE:
- return "Axe";
- case TV_CROWN:
- return "Crown";
- case TV_HELM:
- return "Helm";
- case TV_GLOVES:
- return "Gloves";
- case TV_CLOAK:
- return "Cloak";
- case TV_BOOTS:
- return "Boots";
- case TV_SOFT_ARMOR:
- return "Soft armor";
- case TV_HARD_ARMOR:
- return "Hard armor";
- }
- return "";
-}
-#endif
char *long_intro =
"Essences are the tools of the trade for Alchemists, "
@@ -2814,12 +2754,3 @@ void do_cmd_spoilers(void)
/* Leave "icky" mode */
character_icky = FALSE;
}
-
-
-#else
-
-#ifdef MACINTOSH
-static int i = 0;
-#endif /* MACINTOSH */
-
-#endif
diff --git a/src/wizard2.c b/src/wizard2.c
index 2f018208..a5cf0771 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1650,15 +1650,12 @@ extern void do_cmd_wiz_body(s16b bidx)
do_cmd_redraw();
}
-#ifdef ALLOW_SPOILERS
/*
* External function
*/
extern void do_cmd_spoilers(void);
-#endif /* ALLOW_SPOILERS */
-
/*
@@ -1692,15 +1689,11 @@ void do_cmd_debug(void)
break;
-#ifdef ALLOW_SPOILERS
-
/* Hack -- Generate Spoilers */
case '"':
do_cmd_spoilers();
break;
-#endif /* ALLOW_SPOILERS */
-
case 'A':
status_main();
break;