Wrapped the SCI engine in the Sci namespace.

svn-id: r38676

15 files changed, 52 insertions, 1 deletions

diff --git a/engines/sci/scicore/aatree.cpp b/engines/sci/scicore/aatree.cpp
index 0b1da08aa5..2ec239259c 100644
--- a/engines/sci/scicore/aatree.cpp
+++ b/engines/sci/scicore/aatree.cpp
@@ -27,6 +27,8 @@
 
 #include "sci/include/sci_memory.h"
 
+namespace Sci {
+
 struct aatree {
 	struct aatree *left, *right;
 	int level;
@@ -165,3 +167,5 @@ aatree_free(aatree_t *t) {
 
 	free(t);
 }
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/console.cpp b/engines/sci/scicore/console.cpp
index 1d8b1c1a7b..6cb2bf5b55 100644
--- a/engines/sci/scicore/console.cpp
+++ b/engines/sci/scicore/console.cpp
@@ -28,6 +28,9 @@
 
 #include "sci/include/sci_memory.h"
 #include "sci/include/engine.h"
+
+namespace Sci {
+
 #ifdef SCI_CONSOLE
 
 int con_passthrough = 0;
@@ -137,3 +140,5 @@ close_console_file(void) {
 
 
 #endif /* SCI_CONSOLE */
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/decompress0.cpp b/engines/sci/scicore/decompress0.cpp
index 1027c156b2..c132edebd1 100644
--- a/engines/sci/scicore/decompress0.cpp
+++ b/engines/sci/scicore/decompress0.cpp
@@ -31,6 +31,8 @@
 #include "sci/include/sci_memory.h"
 #include "sci/include/sciresource.h"
 
+namespace Sci {
+
 /* #define _SCI_DECOMPRESS_DEBUG */
 
 /* 9-12 bit LZW encoding */
@@ -361,3 +363,4 @@ int decompress0(resource_t *result, Common::ReadStream &stream, int sci_version)
 	return 0;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/scicore/decompress01.cpp b/engines/sci/scicore/decompress01.cpp
index b0bc2a95f3..e6c4dcd9fa 100644
--- a/engines/sci/scicore/decompress01.cpp
+++ b/engines/sci/scicore/decompress01.cpp
@@ -29,6 +29,8 @@
 #include "sci/include/sci_memory.h"
 #include "sci/include/sciresource.h"
 
+namespace Sci {
+
 /***************************************************************************
 * The following code was originally created by Carl Muckenhoupt for his
 * SCI decoder. It has been ported to the FreeSCI environment by Sergey Lapin.
@@ -633,3 +635,4 @@ int decompress01(resource_t *result, Common::ReadStream &stream, int sci_version
 	return 0;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/scicore/decompress1.cpp b/engines/sci/scicore/decompress1.cpp
index d9fbd72d77..306540c889 100644
--- a/engines/sci/scicore/decompress1.cpp
+++ b/engines/sci/scicore/decompress1.cpp
@@ -29,7 +29,7 @@
 #include "sci/include/sci_memory.h"
 #include "sci/include/sciresource.h"
 
-
+namespace Sci {
 
 /* DEFLATE-DCL
 ** Refer to the FreeSCI docs for a full description.
@@ -432,3 +432,4 @@ int decompress1(resource_t *result, Common::ReadStream &stream, int sci_version)
 	return 0;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/scicore/decompress11.cpp b/engines/sci/scicore/decompress11.cpp
index 4f7e808f1c..701f4ea089 100644
--- a/engines/sci/scicore/decompress11.cpp
+++ b/engines/sci/scicore/decompress11.cpp
@@ -29,6 +29,8 @@
 #include "sci/include/sci_memory.h"
 #include "sci/include/sciresource.h"
 
+namespace Sci {
+
 #define DDEBUG if (0) printf
 
 void decryptinit3(void);
@@ -162,3 +164,4 @@ int decompress11(resource_t *result, Common::ReadStream &stream, int sci_version
 	return 0;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index 1eb69fa163..fc8a59336b 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -33,6 +33,8 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/vocabulary.h" /* For SCI version auto-detection */
 
+namespace Sci {
+
 #undef SCI_REQUIRE_RESOURCE_FILES
 /* #define SCI_VERBOSE_RESMGR 1 */
 
@@ -804,3 +806,4 @@ scir_unlock_resource(ResourceManager *mgr, resource_t *res, int resnum, int rest
 	_scir_free_old_resources(mgr, 0);
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp
index 5aa5a61303..fef1aafd04 100644
--- a/engines/sci/scicore/resource_map.cpp
+++ b/engines/sci/scicore/resource_map.cpp
@@ -29,6 +29,7 @@
 
 #include "common/file.h"
 
+namespace Sci {
 
 #define RESOURCE_MAP_FILENAME "resource.map"
 
@@ -529,3 +530,5 @@ main(int argc, char **argv) {
 	return 0;
 }
 #endif
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/resource_patch.cpp b/engines/sci/scicore/resource_patch.cpp
index c861bd9adc..b4fc6dd2c0 100644
--- a/engines/sci/scicore/resource_patch.cpp
+++ b/engines/sci/scicore/resource_patch.cpp
@@ -29,6 +29,8 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/sci_memory.h"
 
+namespace Sci {
+
 void sci0_sprintf_patch_file_name(char *string, resource_t *res) {
 	sprintf(string, "%s.%03i", sci_resource_types[res->type], res->number);
 }
@@ -183,3 +185,4 @@ int sci1_read_resource_patches(ResourceSource *source, resource_t **resource_p,
 	return 0;
 }
 
+} // End of namespace Sci
diff --git a/engines/sci/scicore/sci_memory.cpp b/engines/sci/scicore/sci_memory.cpp
index e762475e20..539879568d 100644
--- a/engines/sci/scicore/sci_memory.cpp
+++ b/engines/sci/scicore/sci_memory.cpp
@@ -26,6 +26,8 @@
 #include "sci/include/sci_memory.h"
 #include "common/util.h"
 
+namespace Sci {
+
 /* set optimisations for Win32: */
 /* g on: enable global optimizations */
 /* t on: use fast code */
@@ -174,3 +176,5 @@ extern void *sci_refcount_memdup(void *data, size_t len) {
 	memcpy(dest, data, len);
 	return dest;
 }
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/script.cpp b/engines/sci/scicore/script.cpp
index 09fec62a89..c574b67215 100644
--- a/engines/sci/scicore/script.cpp
+++ b/engines/sci/scicore/script.cpp
@@ -27,6 +27,8 @@
 #include "sci/include/engine.h"
 #include "common/util.h"
 
+namespace Sci {
+
 /* #define SCRIPT_DEBUG */
 
 #define END Script_None
@@ -491,3 +493,5 @@ script_dissect(ResourceManager *resmgr, int res_no, char **snames, int snames_nr
 
 	/*vocabulary_free_snames(snames);*/
 }
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp
index ae1c343336..ee89c9b27d 100644
--- a/engines/sci/scicore/tools.cpp
+++ b/engines/sci/scicore/tools.cpp
@@ -67,6 +67,7 @@
 
 #include "sci/include/engine.h"
 
+namespace Sci {
 
 // FIXME: Get rid of G_DIR_SEPARATOR  / G_DIR_SEPARATOR_S
 #if _MSC_VER
@@ -535,3 +536,5 @@ int is_print_str(char *str) {
 
 	return ((float) printable / (float) len >= 0.5);
 }
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp
index e05106ce88..408deb58f4 100644
--- a/engines/sci/scicore/versions.cpp
+++ b/engines/sci/scicore/versions.cpp
@@ -32,6 +32,8 @@
 #include "sci/include/engine.h"
 #include "sci/include/resource.h"
 
+namespace Sci {
+
 void
 version_require_earlier_than(state_t *s, sci_version_t version) {
 	if (s->version_lock_flag)
@@ -88,3 +90,5 @@ version_parse(const char *vn, sci_version_t *result) {
 }
 
 #undef VERSION_DETECT_BUF_SIZE
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index c76ddc1e68..9f7911272d 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -30,6 +30,8 @@
 #include "sci/include/engine.h"
 #include "sci/include/kernel.h"
 
+namespace Sci {
+
 int vocab_version;
 
 #define VOCAB_RESOURCE_PARSE_TREE_BRANCHES vocab_version==1 ? \
@@ -708,3 +710,5 @@ vocab_synonymize_tokens(result_word_t *words, int words_nr, synonym_t *synonyms,
 			if (words[i].group == synonyms[sync].replaceant)
 				words[i].group = synonyms[sync].replacement;
 }
+
+} // End of namespace Sci
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp
index bccb8fcf72..bd3eb2e312 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/scicore/vocab_debug.cpp
@@ -27,6 +27,8 @@
 #include "sci/include/engine.h"
 #include "sci/include/sciresource.h"
 
+namespace Sci {
+
 /* Default kernel name table */
 #define SCI0_KNAMES_WELL_DEFINED 0x6e
 #define SCI0_KNAMES_DEFAULT_ENTRIES_NR 0x72
@@ -418,3 +420,5 @@ void vocabulary_free_knames(char** names) {
 
 	free(names);
 }
+
+} // End of namespace Sci