aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2005-10-23 10:49:34 +0000
committerMax Horn2005-10-23 10:49:34 +0000
commit1eed529803d7022da798320ffa9beed8a62b5b4c (patch)
treea39c9cd70f4c8273295a82f86604ef4b234ff885
parenta39932a228c6d8db8a72fb338bef6c78b3ad0299 (diff)
downloadscummvm-rg350-1eed529803d7022da798320ffa9beed8a62b5b4c.tar.gz
scummvm-rg350-1eed529803d7022da798320ffa9beed8a62b5b4c.tar.bz2
scummvm-rg350-1eed529803d7022da798320ffa9beed8a62b5b4c.zip
Some more Broken Sword I & II -> 1 & 2 changes
svn-id: r19257
-rwxr-xr-xconfigure8
-rw-r--r--sword2/driver/d_sound.cpp2
-rw-r--r--sword2/memory.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index df3ecc1d41..71d0794e2b 100755
--- a/configure
+++ b/configure
@@ -294,8 +294,8 @@ Optional Features:
--disable-he exclude HE70+ games in SCUMM engine
--disable-simon don't build the simon engine
--disable-sky don't build the Beneath a Steel Sky engine
- --disable-sword1 don't build the Broken Sword I engine
- --disable-sword2 don't build the Broken Sword II engine
+ --disable-sword1 don't build the Broken Sword 1 engine
+ --disable-sword2 don't build the Broken Sword 2 engine
--disable-queen don't build the Flight of the Amazon Queen engine
--disable-saga don't build the SAGA engine
--disable-gob don't build the Gobli*ns engine
@@ -1184,7 +1184,7 @@ if test "$_build_sky" = yes ; then
echo " Beneath a Steel Sky"
fi
if test "$_build_sword1" = yes ; then
- echo_n " Broken Sword I"
+ echo_n " Broken Sword 1"
if test "$_mpeg2" = yes ; then
echo " (w/ mpeg2 cutscenes)"
else
@@ -1192,7 +1192,7 @@ if test "$_build_sword1" = yes ; then
fi
fi
if test "$_build_sword2" = yes ; then
- echo_n " Broken Sword II"
+ echo_n " Broken Sword 2"
if test "$_mpeg2" = yes ; then
echo " (w/ mpeg2 cutscenes)"
else
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 91bf4c950b..ed12eaaaf9 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -150,7 +150,7 @@ static AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd
}
// ----------------------------------------------------------------------------
-// Custom AudioStream class to handle Broken Sword II's audio compression.
+// Custom AudioStream class to handle Broken Sword 2's audio compression.
// ----------------------------------------------------------------------------
#define GetCompressedShift(n) ((n) >> 4)
diff --git a/sword2/memory.cpp b/sword2/memory.cpp
index ef030d87ec..a6d1a5d710 100644
--- a/sword2/memory.cpp
+++ b/sword2/memory.cpp
@@ -24,7 +24,7 @@
// with our PocketPC version.
//
// There is one thing that prevents us from replacing the whole memory manager
-// with the standard memory allocation functions: Broken Sword II absolutely,
+// with the standard memory allocation functions: Broken Sword 2 absolutely,
// positively needs to be able to encode pointers as 32-bit integers. The
// original engine did this simply by casting between pointers and integers,
// but as far as I know that's not a very portable thing to do.