SCI32:

	- Set signature for Array/String
	- Add the kernel table differences for the GK2 demo
	- Implement kMessage changes in SCI32
	- Use an empty string as the default path for all games now (and modify kValidPath to accept that only as valid)
	- Add dereferencing for Arrays

svn-id: r46756

1 files changed, 7 insertions, 0 deletions

diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 5db6b88136..755e44c543 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -929,7 +929,14 @@ byte *SegManager::derefBulkPtr(reg_t pointer, int entries) {
 }
 
 reg_t *SegManager::derefRegPtr(reg_t pointer, int entries) {
+#ifdef ENABLE_SCI32
+	// HACK: Due to a limitation in the SegManager, we don't know if the pointer needs to be
+	// word aligned. If it's a new style array, then it is just accessing the arrays from a
+	// table and this doesn't need to be true.
+	if (pointer.offset & 1 && pointer.segment != Arrays_seg_id) {
+#else
 	if (pointer.offset & 1) {
+#endif
 		warning("Unaligned pointer read: %04x:%04x expected with word alignment", PRINT_REG(pointer));
 		return NULL;
 	}