From 2b9664ae8b76dadaace0bd55f6d7b6dbe1367255 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Jun 2012 20:07:56 +0200
Subject: Remove SCORE_{BORGS,WIZARDS,CHEATERS} preprocessor defines

---
 src/config.h | 15 ---------------
 src/files.c  |  6 ------
 2 files changed, 21 deletions(-)

diff --git a/src/config.h b/src/config.h
index 20463a62..99b6b9f0 100644
--- a/src/config.h
+++ b/src/config.h
@@ -135,21 +135,6 @@
 #define HANDLE_SIGNALS
 
 
-/*
- * Allow "Wizards" to yield "high scores"
- */
-/* #define SCORE_WIZARDS */
-
-/*
- * Allow "Borgs" to yield "high scores"
- */
-/*#define SCORE_BORGS*/
-
-/*
- * Allow "Cheaters" to yield "high scores"
- */
-/* #define SCORE_CHEATERS */
-
 
 
 /*
diff --git a/src/files.c b/src/files.c
index 4e2ff70a..cd3a5bf4 100644
--- a/src/files.c
+++ b/src/files.c
@@ -5306,7 +5306,6 @@ static errr top_twenty(void)
 	/* Clear screen */
 	Term_clear();
 
-#ifndef SCORE_WIZARDS
 	/* Wizard-mode pre-empts scoring */
 	if (noscore & 0x000F)
 	{
@@ -5315,9 +5314,7 @@ static errr top_twenty(void)
 		display_scores_aux(highscore_fd, 0, 10, -1, NULL);
 		goto out;
 	}
-#endif
 
-#ifndef SCORE_BORGS
 	/* Borg-mode pre-empts scoring */
 	if (noscore & 0x00F0)
 	{
@@ -5326,9 +5323,7 @@ static errr top_twenty(void)
 		display_scores_aux(highscore_fd, 0, 10, -1, NULL);
 		goto out;
 	}
-#endif
 
-#ifndef SCORE_CHEATERS
 	/* Cheaters are not scored */
 	if (noscore & 0xFF00)
 	{
@@ -5337,7 +5332,6 @@ static errr top_twenty(void)
 		display_scores_aux(highscore_fd, 0, 10, -1, NULL);
 		goto out;
 	}
-#endif
 
 	/* Interupted */
 	if (!total_winner && streq(died_from, "Interrupting"))
-- 
cgit v1.2.3