Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1

1 files changed, 0 insertions, 24 deletions

diff --git a/src/trap_type.hpp b/src/trap_type.hpp
deleted file mode 100644
index d82c925b..00000000
--- a/src/trap_type.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "h-basic.h"
-
-/**
- * Trap descriptor.
- */
-struct trap_type
-{
-	s16b probability;      /* probability of existence */
-	s16b another;          /* does this trap easily combine */
-	s16b p1valinc;         /* how much does this trap attribute to p1val */
-	byte difficulty;       /* how difficult to disarm */
-	byte minlevel;         /* what is the minimum level on which the traps should be */
-	byte color;            /* what is the color on screen */
-	u32b flags;            /* where can these traps go - and perhaps other flags */
-	bool_ ident;           /* do we know the name */
-	s16b known;            /* how well is this trap known */
-	const char *name;      /* normal name like weakness */
-	s16b dd, ds;           /* base damage */
-	char *text;            /* longer description once you've met this trap */
-	byte g_attr;           /* Overlay graphic attribute */
-	char g_char;           /* Overlay graphic character */
-};