summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-12-24 01:40:09 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-12-24 01:40:09 +0100
commit05a8efd7b904a75902eb4007ab156e1918a968b3 (patch)
treef5e3a42b3f8d11ede089e4623f215d9ab8ce066e
parent40af2d839ead4be5dd147a15e076c51711689d7d (diff)
downloadcrawl-ref-05a8efd7b904a75902eb4007ab156e1918a968b3.tar.gz
crawl-ref-05a8efd7b904a75902eb4007ab156e1918a968b3.zip
Rename abl-show.{cc,h} to ability.{cc,h}
The old name was quite puzzling...
-rw-r--r--crawl-ref/source/Crawl.xcodeproj/project.pbxproj16
-rw-r--r--crawl-ref/source/MSVC/crawl.vcproj4
-rw-r--r--crawl-ref/source/MSVC/crawl.vcxproj4
-rw-r--r--crawl-ref/source/MSVC/crawl.vcxproj.filters4
-rw-r--r--crawl-ref/source/Makefile.obj2
-rw-r--r--crawl-ref/source/ability.cc (renamed from crawl-ref/source/abl-show.cc)2
-rw-r--r--crawl-ref/source/ability.h (renamed from crawl-ref/source/abl-show.h)0
-rw-r--r--crawl-ref/source/chardump.cc2
-rw-r--r--crawl-ref/source/command.cc2
-rw-r--r--crawl-ref/source/delay.cc2
-rw-r--r--crawl-ref/source/describe.cc2
-rw-r--r--crawl-ref/source/godabil.cc2
-rw-r--r--crawl-ref/source/hints.cc2
-rw-r--r--crawl-ref/source/item_use.cc2
-rw-r--r--crawl-ref/source/l_you.cc2
-rw-r--r--crawl-ref/source/main.cc2
-rw-r--r--crawl-ref/source/mon-behv.cc2
-rw-r--r--crawl-ref/source/mutation.cc2
-rw-r--r--crawl-ref/source/ng-setup.cc2
-rw-r--r--crawl-ref/source/output.cc2
-rw-r--r--crawl-ref/source/player.cc2
-rw-r--r--crawl-ref/source/religion.cc2
-rw-r--r--crawl-ref/source/skills.cc2
-rw-r--r--crawl-ref/source/tilereg-abl.cc2
-rw-r--r--crawl-ref/source/tilereg-cmd.cc2
-rw-r--r--crawl-ref/source/tilesdl.cc2
-rwxr-xr-xcrawl-ref/source/util/gather_abilities4
27 files changed, 37 insertions, 37 deletions
diff --git a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
index 43158adfac..eee3dd642f 100644
--- a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
+++ b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
7BBC4A080B0F783C00F27D45 /* levcomp.ypp in Sources */ = {isa = PBXBuildFile; fileRef = 7B352ED20B001B9E00CABB32 /* levcomp.ypp */; };
7BDE8444116D247D00974D63 /* player-equip.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BDE8442116D247D00974D63 /* player-equip.cc */; };
7BDE8445116D247D00974D63 /* player-equip.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BDE8442116D247D00974D63 /* player-equip.cc */; };
- 7BDE8447116D24B300974D63 /* abl-show.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F5D10BD494300A99626 /* abl-show.cc */; };
+ 7BDE8447116D24B300974D63 /* ability.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F5D10BD494300A99626 /* ability.cc */; };
7BDE8448116D24B300974D63 /* abyss.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F5F10BD494300A99626 /* abyss.cc */; };
7BDE8449116D24B300974D63 /* actor-los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F6110BD494300A99626 /* actor-los.cc */; };
7BDE844A116D24B300974D63 /* actor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F6210BD494300A99626 /* actor.cc */; };
@@ -470,7 +470,7 @@
D2A696BD0DA29D4E00FDDE82 /* Crawl.icns in Resources */ = {isa = PBXBuildFile; fileRef = D2A696BC0DA29D4E00FDDE82 /* Crawl.icns */; };
D2F272350DA1C5AD00445FE9 /* dat in Resources */ = {isa = PBXBuildFile; fileRef = D2F271FE0DA1C5AD00445FE9 /* dat */; };
D2F2725B0DA1C61600445FE9 /* docs in Resources */ = {isa = PBXBuildFile; fileRef = D2F2723F0DA1C61600445FE9 /* docs */; };
- E5D640BE10BD494500A99626 /* abl-show.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F5D10BD494300A99626 /* abl-show.cc */; };
+ E5D640BE10BD494500A99626 /* ability.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F5D10BD494300A99626 /* ability.cc */; };
E5D640BF10BD494500A99626 /* abyss.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F5F10BD494300A99626 /* abyss.cc */; };
E5D640C010BD494500A99626 /* actor-los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F6110BD494300A99626 /* actor-los.cc */; };
E5D640C110BD494500A99626 /* actor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E5D63F6210BD494300A99626 /* actor.cc */; };
@@ -1257,8 +1257,8 @@
D2F271F60DA1C58C00445FE9 /* Dungeon Crawl Stone Soup - ASCII.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Dungeon Crawl Stone Soup - ASCII.app"; sourceTree = BUILT_PRODUCTS_DIR; };
D2F271FE0DA1C5AD00445FE9 /* dat */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dat; sourceTree = "<group>"; };
D2F2723F0DA1C61600445FE9 /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = docs; path = ../docs; sourceTree = SOURCE_ROOT; };
- E5D63F5D10BD494300A99626 /* abl-show.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "abl-show.cc"; sourceTree = "<group>"; };
- E5D63F5E10BD494300A99626 /* abl-show.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "abl-show.h"; sourceTree = "<group>"; };
+ E5D63F5D10BD494300A99626 /* ability.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "ability.cc"; sourceTree = "<group>"; };
+ E5D63F5E10BD494300A99626 /* ability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ability.h"; sourceTree = "<group>"; };
E5D63F5F10BD494300A99626 /* abyss.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = abyss.cc; sourceTree = "<group>"; };
E5D63F6010BD494300A99626 /* abyss.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = abyss.h; sourceTree = "<group>"; };
E5D63F6110BD494300A99626 /* actor-los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "actor-los.cc"; sourceTree = "<group>"; };
@@ -1751,8 +1751,8 @@
7B352EF00B001F5B00CABB32 /* Crawl */ = {
isa = PBXGroup;
children = (
- E5D63F5D10BD494300A99626 /* abl-show.cc */,
- E5D63F5E10BD494300A99626 /* abl-show.h */,
+ E5D63F5D10BD494300A99626 /* ability.cc */,
+ E5D63F5E10BD494300A99626 /* ability.h */,
E5D63F5F10BD494300A99626 /* abyss.cc */,
E5D63F6010BD494300A99626 /* abyss.h */,
1F909ABD148B23BC00084E83 /* acquire.cc */,
@@ -2916,7 +2916,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 7BDE8447116D24B300974D63 /* abl-show.cc in Sources */,
+ 7BDE8447116D24B300974D63 /* ability.cc in Sources */,
7BDE8448116D24B300974D63 /* abyss.cc in Sources */,
1F909C24148B466700084E83 /* acquire.cc in Sources */,
7B51659511859CFA005B23ED /* act-iter.cc in Sources */,
@@ -3159,7 +3159,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- E5D640BE10BD494500A99626 /* abl-show.cc in Sources */,
+ E5D640BE10BD494500A99626 /* ability.cc in Sources */,
E5D640BF10BD494500A99626 /* abyss.cc in Sources */,
1F909AE1148B23BC00084E83 /* acquire.cc in Sources */,
7B51659411859CFA005B23ED /* act-iter.cc in Sources */,
diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index f2c8ec202c..cee1761e6c 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -675,11 +675,11 @@
</References>
<Files>
<File
- RelativePath="..\abl-show.cc"
+ RelativePath="..\ability.cc"
>
</File>
<File
- RelativePath="..\abl-show.h"
+ RelativePath="..\ability.h"
>
</File>
<File
diff --git a/crawl-ref/source/MSVC/crawl.vcxproj b/crawl-ref/source/MSVC/crawl.vcxproj
index 614febb62c..65cada599a 100644
--- a/crawl-ref/source/MSVC/crawl.vcxproj
+++ b/crawl-ref/source/MSVC/crawl.vcxproj
@@ -215,7 +215,7 @@ perl.exe "util/gen-cflg.pl" compflag.h "&lt;UNKNOWN&gt;" "&lt;UNKNOWN&gt;"
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\abl-show.cc" />
+ <ClCompile Include="..\ability.cc" />
<ClCompile Include="..\abyss.cc" />
<ClCompile Include="..\acquire.cc" />
<ClCompile Include="..\act-iter.cc" />
@@ -595,7 +595,7 @@ perl.exe "util/gen-cflg.pl" compflag.h "&lt;UNKNOWN&gt;" "&lt;UNKNOWN&gt;"
<ClCompile Include="..\zotdef.cc" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\abl-show.h" />
+ <ClInclude Include="..\ability.h" />
<ClInclude Include="..\abyss.h" />
<ClInclude Include="..\acquire.h" />
<ClInclude Include="..\act-iter.h" />
diff --git a/crawl-ref/source/MSVC/crawl.vcxproj.filters b/crawl-ref/source/MSVC/crawl.vcxproj.filters
index 32189d9aa2..0de0e20f66 100644
--- a/crawl-ref/source/MSVC/crawl.vcxproj.filters
+++ b/crawl-ref/source/MSVC/crawl.vcxproj.filters
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="..\abl-show.cc" />
+ <ClCompile Include="..\ability.cc" />
<ClCompile Include="..\abyss.cc" />
<ClCompile Include="..\acquire.cc" />
<ClCompile Include="..\act-iter.cc" />
@@ -294,7 +294,7 @@
<ClCompile Include="..\spl-pick.cc" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\abl-show.h" />
+ <ClInclude Include="..\ability.h" />
<ClInclude Include="..\abyss.h" />
<ClInclude Include="..\acquire.h" />
<ClInclude Include="..\act-iter.h" />
diff --git a/crawl-ref/source/Makefile.obj b/crawl-ref/source/Makefile.obj
index 5fcb90fc4e..7906a54dde 100644
--- a/crawl-ref/source/Makefile.obj
+++ b/crawl-ref/source/Makefile.obj
@@ -1,5 +1,5 @@
OBJECTS = \
-abl-show.o \
+ability.o \
abyss.o \
acquire.o \
act-iter.o \
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/ability.cc
index 4dac07ad47..2b158ce47b 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/ability.cc
@@ -5,7 +5,7 @@
#include "AppHdr.h"
-#include "abl-show.h"
+#include "ability.h"
#include <sstream>
#include <iomanip>
diff --git a/crawl-ref/source/abl-show.h b/crawl-ref/source/ability.h
index 7058bdd2fa..7058bdd2fa 100644
--- a/crawl-ref/source/abl-show.h
+++ b/crawl-ref/source/ability.h
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index a7861c49ea..904617603e 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -21,7 +21,7 @@
#include "externs.h"
#include "options.h"
-#include "abl-show.h"
+#include "ability.h"
#include "art-enum.h"
#include "artefact.h"
#include "branch.h"
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index cb659dbbaf..14a6e081ba 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -15,7 +15,7 @@
#include "externs.h"
#include "options.h"
-#include "abl-show.h"
+#include "ability.h"
#include "branch.h"
#include "chardump.h"
#include "cio.h"
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index b645bdf928..c8dfb73d89 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <string.h>
-#include "abl-show.h"
+#include "ability.h"
#include "artefact.h"
#include "clua.h"
#include "command.h"
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 6e3593793f..2c380cf8f8 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -19,7 +19,7 @@
#include "options.h"
#include "species.h"
-#include "abl-show.h"
+#include "ability.h"
#include "artefact.h"
#include "cio.h"
#include "clua.h"
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 026d909ae0..2642fd1915 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -1316,7 +1316,7 @@ bool zin_remove_all_mutations()
bool zin_sanctuary()
{
// Casting is disallowed while previous sanctuary in effect.
- // (Checked in abl-show.cc.)
+ // (Checked in ability.cc.)
if (env.sanctuary_time)
return false;
diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index 65003c2457..1f154623e6 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -12,7 +12,7 @@
#include "hints.h"
-#include "abl-show.h"
+#include "ability.h"
#include "artefact.h"
#include "cloud.h"
#include "colour.h"
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 77d16c406b..535432625b 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -7,7 +7,7 @@
#include "item_use.h"
-#include "abl-show.h"
+#include "ability.h"
#include "act-iter.h"
#include "areas.h"
#include "art-enum.h"
diff --git a/crawl-ref/source/l_you.cc b/crawl-ref/source/l_you.cc
index 810bf6e15f..60ada5d5cf 100644
--- a/crawl-ref/source/l_you.cc
+++ b/crawl-ref/source/l_you.cc
@@ -3,7 +3,7 @@
#include "cluautil.h"
#include "l_libs.h"
-#include "abl-show.h"
+#include "ability.h"
#include "abyss.h"
#include "areas.h"
#include "branch.h"
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 2322e9cec8..557ec6dc2b 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -29,7 +29,7 @@
#include "externs.h"
-#include "abl-show.h"
+#include "ability.h"
#include "abyss.h"
#include "acquire.h"
#include "act-iter.h"
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 4c09ef09e8..a784a69069 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -8,7 +8,7 @@
#include "externs.h"
-#include "abl-show.h"
+#include "ability.h"
#include "act-iter.h"
#include "areas.h"
#include "coord.h"
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index dcb41d37b7..c4775b9973 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -15,7 +15,7 @@
#include "externs.h"
-#include "abl-show.h"
+#include "ability.h"
#include "act-iter.h"
#include "art-enum.h"
#include "artefact.h"
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 7dc5cf5904..dc7372a66f 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -2,7 +2,7 @@
#include "ng-setup.h"
-#include "abl-show.h"
+#include "ability.h"
#include "decks.h"
#include "dungeon.h"
#include "files.h"
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 8f7f0daf31..d4ed5e8269 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -15,7 +15,7 @@
#include "options.h"
#include "species.h"
-#include "abl-show.h"
+#include "ability.h"
#include "areas.h"
#include "artefact.h"
#include "branch.h"
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 294200eb4e..928943fb5a 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3566,7 +3566,7 @@ void level_change(int source, const char* aux, bool skip_attribute_increase)
}
}
- // zot defence abilities; must also be updated in abl-show.cc when these levels are changed
+ // zot defence abilities; must also be updated in ability.cc when these levels are changed
if (crawl_state.game_is_zotdef())
{
if (you.experience_level == 1)
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d9ae93b9d5..c9fb71c9b7 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -16,7 +16,7 @@
#include "externs.h"
-#include "abl-show.h"
+#include "ability.h"
#include "act-iter.h"
#include "branch.h"
#include "acquire.h"
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index ed186e831d..4618f2d5a9 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -12,7 +12,7 @@
#include <string.h>
#include <stdlib.h>
-#include "abl-show.h"
+#include "ability.h"
#include "evoke.h"
#include "exercise.h"
#include "externs.h"
diff --git a/crawl-ref/source/tilereg-abl.cc b/crawl-ref/source/tilereg-abl.cc
index 034b7234aa..8fdfbbee01 100644
--- a/crawl-ref/source/tilereg-abl.cc
+++ b/crawl-ref/source/tilereg-abl.cc
@@ -5,7 +5,7 @@
#include "tilereg-abl.h"
#include "process_desc.h"
-#include "abl-show.h"
+#include "ability.h"
#include "cio.h"
#include "libutil.h"
#include "macro.h"
diff --git a/crawl-ref/source/tilereg-cmd.cc b/crawl-ref/source/tilereg-cmd.cc
index 2835bb6cff..80b0da34b7 100644
--- a/crawl-ref/source/tilereg-cmd.cc
+++ b/crawl-ref/source/tilereg-cmd.cc
@@ -5,7 +5,7 @@
#include "tilereg-cmd.h"
#include "process_desc.h"
-#include "abl-show.h"
+#include "ability.h"
#include "cio.h"
#include "command.h"
#include "process_desc.h"
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 58918f2761..611f41448d 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -2,7 +2,7 @@
#ifdef USE_TILE_LOCAL
-#include "abl-show.h"
+#include "ability.h"
#include "artefact.h"
#include "cio.h"
#include "command.h"
diff --git a/crawl-ref/source/util/gather_abilities b/crawl-ref/source/util/gather_abilities
index 752b37993d..7c32399812 100755
--- a/crawl-ref/source/util/gather_abilities
+++ b/crawl-ref/source/util/gather_abilities
@@ -1,11 +1,11 @@
#!/usr/bin/perl -w
undef $/;
-open IN, "util/cpp_version abl-show.cc|" or die "Can't read abl-show.cc\n";
+open IN, "util/cpp_version ability.cc|" or die "Can't read ability.cc\n";
$_ = <IN>;
close IN;
s/.*Ability_List\[\] =\n{\n(.*?)};.*/$1/s
- or die "Can't find Ability_List[] in abl-show.cc\n";
+ or die "Can't find Ability_List[] in ability.cc\n";
print join("\n", sort /ABIL_[A-Z0-9_]+\s*,\s*"([*-Za-z0-9 '-]+)"/sg), "\n";