SCI: Moved sciconsole.h and sys_strings.h to the dirs their *.cpp counterparts are in

svn-id: r38835

8 files changed, 86 insertions, 7 deletions

diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp
index f3a3d2c33b..899defa373 100644
--- a/engines/sci/engine/grammar.cpp
+++ b/engines/sci/engine/grammar.cpp
@@ -30,7 +30,7 @@
 
 #include "sci/tools.h"
 #include "sci/include/vocabulary.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/heap.cpp b/engines/sci/engine/heap.cpp
index 7ea0f41c2b..a68c12bcbc 100644
--- a/engines/sci/engine/heap.cpp
+++ b/engines/sci/engine/heap.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/include/engine.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 #include "sci/engine/heap.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index f60f8564f6..e583d1c4cc 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -31,7 +31,7 @@
 
 #include "sci/engine/kdebug.h"
 #include "sci/include/uinput.h"
-#include "sci/include/sciconsole.h" /* sciprintf() */
+#include "sci/scicore/sciconsole.h" /* sciprintf() */
 
 namespace Sci {
 
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 2fdc6d8d4b..ab9f088e59 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -28,7 +28,7 @@
 #include "sci/engine/gc.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 #include "sci/engine/kdebug.h"
 #include "sci/include/vocabulary.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index 56b6f550cb..f77e6ebb77 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -26,7 +26,6 @@
 #ifndef _SCI_SEG_MANAGER_H
 #define _SCI_SEG_MANAGER_H
 
-#include "sci/engine/intmap.h"
 #include "sci/engine/vm.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/sys_strings.cpp b/engines/sci/engine/sys_strings.cpp
index bcb7dd9219..7aba4b58d3 100644
--- a/engines/sci/engine/sys_strings.cpp
+++ b/engines/sci/engine/sys_strings.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/tools.h"
-#include "sci/include/sys_strings.h"
+#include "sci/engine/sys_strings.h"
 #include "sci/sci_memory.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/sys_strings.h b/engines/sci/engine/sys_strings.h
new file mode 100644
index 0000000000..2d89a263d8
--- /dev/null
+++ b/engines/sci/engine/sys_strings.h
@@ -0,0 +1,80 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef SCI_SYS_STRINGS_H
+#define SCI_SYS_STRINGS_H
+
+namespace Sci {
+
+enum {
+	SYS_STRINGS_MAX = 4,
+
+	SYS_STRING_SAVEDIR = 0,
+	SYS_STRING_PARSER_BASE = 1,
+
+	MAX_PARSER_BASE = 64
+};
+
+struct sys_string_t {
+	char *name;
+	int max_size;
+	char *value;
+};
+
+struct sys_strings_t {
+	sys_string_t strings[SYS_STRINGS_MAX];
+};
+
+void sys_string_acquire(sys_strings_t *strings, int index, const char *name, int max_len);
+/* Reserves a new system string
+** Parameters: (sys_strings_t *) strings: The string table to reserve in
+**             (int) index: Index number to reserve
+**             (const char *) name: Name the entry should be tagged with
+**             (int) max_len: Maximum string length in bytes
+*/
+
+int sys_string_set(sys_strings_t *strings, int index, const char *value);
+/* Sets the value of a system string
+** Parameters: (sys_strings_t *) strings: The string table to use
+**             (int) index: Index of the string to write to
+**             (const char *) value: The value to copy
+** Returns   : 0 on success, 1 on error
+** Length clipping is performed.
+*/
+
+void sys_strings_restore(sys_strings_t *new_strings, sys_strings_t *old_strings);
+/* Cleanup system strings after a gamestate restore
+** Parameters: (sys_strings_t *) The freshly loaded system strings to clean up
+**             (sys_strings_t *) The old system strings to clean up
+*/
+
+void sys_string_free_all(sys_strings_t *strings);
+/* Deallocates all allocated system strings
+** Parameters: (sys_strings_t *) strings: The string table to deallocate
+*/
+
+} // End of namespace Sci
+
+#endif // SCI_SYS_STRINGS_H
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index d64b6e67e3..a2a3124005 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -30,10 +30,10 @@
 
 #include "sci/include/versions.h"	// for sci_version_t
 #include "sci/include/vm_types.h"	// for reg_t
-#include "sci/include/sys_strings.h"
 #include "sci/include/heapmgr.h"
 
 #include "sci/engine/intmap.h"
+#include "sci/engine/sys_strings.h"
 
 namespace Sci {