Get rid of misc.cc.

It is very silly.

diff --git a/MANIFEST b/MANIFEST
index e099fe4..d576661 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -18,7 +18,6 @@ log.cc
 main.cc
 map.cc
 map.hh
-misc.cc
 mon2.cc
 monsters.cc
 monsters.hh

diff --git a/Makefile b/Makefile
index e5a6dcf..1f4dda1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ include features.mk
 GENERATED_OBJS:=permobj.o permons.o 
 GENERATED_SOURCE:=permobj.cc pobj_id.hh permons.cc pmon_id.hh
 GENERATED_MAKES:=dirs.mk features.mk
-HANDWRITTEN_OBJS:=combat.o display-nc.o fov.o log.o main.o map.o misc.o monsters.o mon2.o notify-local-tty.o objects.o pmon2.o rng.o sorcery.o u.o util.o
+HANDWRITTEN_OBJS:=combat.o display-nc.o fov.o log.o main.o map.o monsters.o mon2.o notify-local-tty.o objects.o pmon2.o rng.o sorcery.o u.o util.o
 OBJS:=$(GENERATED_OBJS) $(HANDWRITTEN_OBJS)
 GAME:=victrix-abyssi
 MAJVERS:=0

diff --git a/combat.cc b/combat.cc
index 573cff6..37cd9aa 100644 (file)
--- a/combat.cc
+++ b/combat.cc
@@ -2,7 +2,7 @@
  *  \brief combat mechanics
  */
 
-/* Copyright 2005-2013 Martin Read
+/* Copyright 2005-2014 Martin Read
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/display-nc.cc b/display-nc.cc
index 259153c..d028419 100644 (file)
--- a/display-nc.cc
+++ b/display-nc.cc
@@ -114,6 +114,19 @@ cchar_t const *back_buffer[DUN_HEIGHT][DUN_WIDTH];
 Attr_wrapper attr_override[DISP_HEIGHT][DISP_WIDTH];
 cchar_t const *front_buffer[DISP_HEIGHT][DISP_WIDTH];
 
+/* These were in misc.cc, but nothing else was. Ergo, delete misc.cc */
+char const *damtype_names[DT_COUNT] = {
+    "physical damage",
+    "cold",
+    "fire",
+    "necromantic force",
+    "electricity",
+    "hellfire",
+    "poison",
+    "knockback",
+    "drowning",
+};
+
 /* Prototypes for static funcs */
 static cchar_t const *object_char(int object_id);
 static cchar_t const *monster_char(int monster_id);

diff --git a/misc.cc b/misc.cc
deleted file mode 100644 (file)
index fd75a0a..0000000
--- a/misc.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/* \file misc.cc
- * \brief Stuff.
- */
-
-/* Copyright 2005-2013 Martin Read
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "victrix-abyssi.hh"
-
-char const *damtype_names[DT_COUNT] = {
-    "physical damage",
-    "cold",
-    "fire",
-    "necromantic force",
-    "electricity",
-    "hellfire",
-    "poison",
-    "knockback",
-    "drowning",
-};
-
-/* misc.cc */
-// vim:cindent