aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-03-08 08:17:18 +0000
committerMax Horn2009-03-08 08:17:18 +0000
commit7cf72e8a177b0cbc1c7f9c9e838cf8596ab9e849 (patch)
treefba4dcfb3f56f969ddb435e1a2fcbd7a1939f840
parent877629cb2e9c24622cd03d9e3433ab37c7207902 (diff)
downloadscummvm-rg350-7cf72e8a177b0cbc1c7f9c9e838cf8596ab9e849.tar.gz
scummvm-rg350-7cf72e8a177b0cbc1c7f9c9e838cf8596ab9e849.tar.bz2
scummvm-rg350-7cf72e8a177b0cbc1c7f9c9e838cf8596ab9e849.zip
SCI: Renamed vocab.cpp to vocabulary.cpp, to match the name of the header file
svn-id: r39213
-rwxr-xr-xdists/iphone/scummvm.xcodeproj/project.pbxproj8
-rw-r--r--dists/msvc7/sci.vcproj2
-rw-r--r--dists/msvc71/sci.vcproj2
-rw-r--r--dists/msvc8/sci.vcproj2
-rw-r--r--dists/msvc9/sci.vcproj2
-rw-r--r--engines/sci/module.mk2
-rw-r--r--engines/sci/scicore/vocabulary.cpp (renamed from engines/sci/scicore/vocab.cpp)0
7 files changed, 9 insertions, 9 deletions
diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj
index df8fc8d6b0..a1103ee0f5 100755
--- a/dists/iphone/scummvm.xcodeproj/project.pbxproj
+++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj
@@ -840,7 +840,7 @@
DFC831620F48AF19005EF03C /* decompress11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC8309E0F48AF19005EF03C /* decompress11.cpp */; };
DFC831710F48AF19005EF03C /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830B00F48AF19005EF03C /* resource.cpp */; };
DFC8317B0F48AF19005EF03C /* versions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BA0F48AF19005EF03C /* versions.cpp */; };
- DFC8317C0F48AF19005EF03C /* vocab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BB0F48AF19005EF03C /* vocab.cpp */; };
+ DFC8317C0F48AF19005EF03C /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BB0F48AF19005EF03C /* vocabulary.cpp */; };
DFC8317D0F48AF19005EF03C /* vocab_debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BC0F48AF19005EF03C /* vocab_debug.cpp */; };
DFC8317E0F48AF19005EF03C /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BE0F48AF19005EF03C /* adlib.cpp */; };
DFC8317F0F48AF19005EF03C /* core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830C00F48AF19005EF03C /* core.cpp */; };
@@ -2366,7 +2366,7 @@
DFC8309E0F48AF19005EF03C /* decompress11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decompress11.cpp; sourceTree = "<group>"; };
DFC830B00F48AF19005EF03C /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
DFC830BA0F48AF19005EF03C /* versions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versions.cpp; sourceTree = "<group>"; };
- DFC830BB0F48AF19005EF03C /* vocab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vocab.cpp; sourceTree = "<group>"; };
+ DFC830BB0F48AF19005EF03C /* vocabulary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vocabulary.cpp; sourceTree = "<group>"; };
DFC830BC0F48AF19005EF03C /* vocab_debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vocab_debug.cpp; sourceTree = "<group>"; };
DFC830BE0F48AF19005EF03C /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; };
DFC830BF0F48AF19005EF03C /* adlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlib.h; sourceTree = "<group>"; };
@@ -4329,7 +4329,7 @@
DFC8309E0F48AF19005EF03C /* decompress11.cpp */,
DFC830B00F48AF19005EF03C /* resource.cpp */,
DFC830BA0F48AF19005EF03C /* versions.cpp */,
- DFC830BB0F48AF19005EF03C /* vocab.cpp */,
+ DFC830BB0F48AF19005EF03C /* vocabulary.cpp */,
DFC830BC0F48AF19005EF03C /* vocab_debug.cpp */,
);
path = scicore;
@@ -5828,7 +5828,7 @@
DFC831620F48AF19005EF03C /* decompress11.cpp in Sources */,
DFC831710F48AF19005EF03C /* resource.cpp in Sources */,
DFC8317B0F48AF19005EF03C /* versions.cpp in Sources */,
- DFC8317C0F48AF19005EF03C /* vocab.cpp in Sources */,
+ DFC8317C0F48AF19005EF03C /* vocabulary.cpp in Sources */,
DFC8317D0F48AF19005EF03C /* vocab_debug.cpp in Sources */,
DFC8317E0F48AF19005EF03C /* adlib.cpp in Sources */,
DFC8317F0F48AF19005EF03C /* core.cpp in Sources */,
diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj
index 7fae95ee11..e17f540f4f 100644
--- a/dists/msvc7/sci.vcproj
+++ b/dists/msvc7/sci.vcproj
@@ -355,7 +355,7 @@
RelativePath="..\..\engines\sci\scicore\versions.cpp">
</File>
<File
- RelativePath="..\..\engines\sci\scicore\vocab.cpp">
+ RelativePath="..\..\engines\sci\scicore\vocabulary.cpp">
</File>
<File
RelativePath="..\..\engines\sci\scicore\vocab_debug.cpp">
diff --git a/dists/msvc71/sci.vcproj b/dists/msvc71/sci.vcproj
index a76c2303ba..28f431b8a9 100644
--- a/dists/msvc71/sci.vcproj
+++ b/dists/msvc71/sci.vcproj
@@ -369,7 +369,7 @@
RelativePath="..\..\engines\sci\scicore\versions.cpp">
</File>
<File
- RelativePath="..\..\engines\sci\scicore\vocab.cpp">
+ RelativePath="..\..\engines\sci\scicore\vocabulary.cpp">
</File>
<File
RelativePath="..\..\engines\sci\scicore\vocab_debug.cpp">
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 87a6dde0c9..c085fb1fe8 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -502,7 +502,7 @@
>
</File>
<File
- RelativePath="..\..\engines\sci\scicore\vocab.cpp"
+ RelativePath="..\..\engines\sci\scicore\vocabulary.cpp"
>
</File>
<File
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index c686d600d7..582fda07f0 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -503,7 +503,7 @@
>
</File>
<File
- RelativePath="..\..\engines\sci\scicore\vocab.cpp"
+ RelativePath="..\..\engines\sci\scicore\vocabulary.cpp"
>
</File>
<File
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index e8f34ad314..287759f52b 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -59,7 +59,7 @@ MODULE_OBJS = \
scicore/decompress11.o \
scicore/resource.o \
scicore/versions.o \
- scicore/vocab.o \
+ scicore/vocabulary.o \
scicore/vocab_debug.o \
sfx/adlib.o \
sfx/core.o \
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocabulary.cpp
index b7a9401300..b7a9401300 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocabulary.cpp