summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-06-29 12:28:12 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-06-29 12:42:00 -0400
commite474da1e0004925d66d3452e184aa3c509aeb91a (patch)
treeb200f6ea1229b1674a8b52fc06a796c335bdbc76
parentf4e1034dece99765c1c67e56ce78d14af4b30da6 (diff)
downloadcrawl-ref-e474da1e0004925d66d3452e184aa3c509aeb91a.tar.gz
crawl-ref-e474da1e0004925d66d3452e184aa3c509aeb91a.zip
Rename bless.{cc,h} -> godblessing.{cc,h}.
-rw-r--r--crawl-ref/source/Makefile.obj2
-rw-r--r--crawl-ref/source/godabil.cc2
-rw-r--r--crawl-ref/source/godblessing.cc (renamed from crawl-ref/source/bless.cc)2
-rw-r--r--crawl-ref/source/godblessing.h (renamed from crawl-ref/source/bless.h)0
-rw-r--r--crawl-ref/source/mon-death.cc2
-rw-r--r--crawl-ref/source/wiz-mon.cc2
6 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/Makefile.obj b/crawl-ref/source/Makefile.obj
index 2aed29cfc3..d0e861f889 100644
--- a/crawl-ref/source/Makefile.obj
+++ b/crawl-ref/source/Makefile.obj
@@ -14,7 +14,6 @@ attitude-change.o \
beam.o \
behold.o \
bitary.o \
-bless.o \
branch.o \
chardump.o \
cio.o \
@@ -67,6 +66,7 @@ fprop.o \
geom2d.o \
ghost.o \
godabil.o \
+godblessing.o \
godcompanions.o \
godconduct.o \
goditem.o \
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 0f1c7529e9..7a1b071ec3 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -12,7 +12,6 @@
#include "artefact.h"
#include "attitude-change.h"
#include "beam.h"
-#include "bless.h"
#include "branch.h"
#include "cloud.h"
#include "colour.h"
@@ -29,6 +28,7 @@
#include "food.h"
#include "fprop.h"
#include "godabil.h"
+#include "godblessing.h"
#include "godcompanions.h"
#include "goditem.h"
#include "invent.h"
diff --git a/crawl-ref/source/bless.cc b/crawl-ref/source/godblessing.cc
index f4a4e7545b..d18a7737b8 100644
--- a/crawl-ref/source/bless.cc
+++ b/crawl-ref/source/godblessing.cc
@@ -5,7 +5,7 @@
#include "AppHdr.h"
-#include "bless.h"
+#include "godblessing.h"
#include "artefact.h" // if_artefact()
#include "env.h" // mitm
diff --git a/crawl-ref/source/bless.h b/crawl-ref/source/godblessing.h
index b9bbb3a7fb..b9bbb3a7fb 100644
--- a/crawl-ref/source/bless.h
+++ b/crawl-ref/source/godblessing.h
diff --git a/crawl-ref/source/mon-death.cc b/crawl-ref/source/mon-death.cc
index 79356e376e..5862420965 100644
--- a/crawl-ref/source/mon-death.cc
+++ b/crawl-ref/source/mon-death.cc
@@ -13,7 +13,6 @@
#include "artefact.h"
#include "attitude-change.h"
#include "beam.h"
-#include "bless.h"
#include "cluautil.h"
#include "cloud.h"
#include "coordit.h"
@@ -29,6 +28,7 @@
#include "food.h"
#include "fprop.h"
#include "godabil.h"
+#include "godblessing.h"
#include "godconduct.h"
#include "godcompanions.h"
#include "hints.h"
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index 0323d20af0..51dd5b03c5 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -12,7 +12,6 @@
#include "act-iter.h"
#include "areas.h"
#include "artefact.h"
-#include "bless.h"
#include "cio.h"
#include "colour.h"
#include "dbg-util.h"
@@ -22,6 +21,7 @@
#include "env.h"
#include "files.h"
#include "ghost.h"
+#include "godblessing.h"
#include "invent.h"
#include "itemprop.h"
#include "items.h"