From a32b7b38518dd662304a2645bfe4288b18522183 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 27 May 2010 17:47:32 +0000
Subject: Fix starting GK1.

svn-id: r49265
---
 engines/sci/engine/kernel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/kernel.cpp')

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 49266f3a18..5527939950 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -336,7 +336,7 @@ SciKernelFunction kfunct_mappers[] = {
 	DEFUN("SetQuitStr", kSetQuitStr, "r"),
 	DEFUN("ShowMovie", kShowMovie, ".*"),
 	DEFUN("SetVideoMode", kSetVideoMode, "i"),
-	DEFUN("Platform", kPlatform, "i.*"),
+	DEFUN("Platform", kPlatform, ".*"),
 	DEFUN("TextColors", kTextColors, ".*"),
 	DEFUN("TextFonts", kTextFonts, ".*"),
 	DEFUN("Portrait", kPortrait, ".*"),
-- 
cgit v1.2.3


From 967d9ea308342cbfb3c99904b5d6f1a0a3cd7ba0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 28 May 2010 10:45:20 +0000
Subject: Added a stub for kMergePoly, to avoid crashing in QFG1VGA after
 killing a monster

svn-id: r49288
---
 engines/sci/engine/kernel.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/sci/engine/kernel.cpp')

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 5527939950..50d79c432b 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -332,6 +332,7 @@ SciKernelFunction kfunct_mappers[] = {
 	DEFUN("DoSync", kDoSync, ".*"),
 	DEFUN("MemorySegment", kMemorySegment, "iri*"),
 	DEFUN("Intersections", kIntersections, "iiiiriiiri"),
+	DEFUN("MergePoly", kMergePoly, "rli"),
 	DEFUN("ResCheck", kResCheck, "iii*"),
 	DEFUN("SetQuitStr", kSetQuitStr, "r"),
 	DEFUN("ShowMovie", kShowMovie, ".*"),
-- 
cgit v1.2.3


From d9c0abe0b827a5c1fe15528ba3430fcbf2bdf71b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 28 May 2010 10:53:03 +0000
Subject: Cleanup

svn-id: r49290
---
 engines/sci/engine/kernel.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/sci/engine/kernel.cpp')

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 50d79c432b..ae3d30e81d 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -383,7 +383,6 @@ SciKernelFunction kfunct_mappers[] = {
 	DEFUN("ShiftScreen", kShiftScreen, ".*"),
 	DEFUN("ListOps", kListOps, ".*"),
 	DEFUN("ATan", kATan, ".*"),
-	DEFUN("MergePoly", kMergePoly, ".*"),
 	DEFUN("Record", kRecord, ".*"),
 	DEFUN("PlayBack", kPlayBack, ".*"),
 	DEFUN("DbugStr", kDbugStr, ".*"),
-- 
cgit v1.2.3


From c32e88fe0bb61e75ca983072ba28102d4efbf123 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 30 May 2010 16:14:31 +0000
Subject: Limit access to the _bufSize, _scriptSize and _heapSize members of
 the Script class

svn-id: r49327
---
 engines/sci/engine/kernel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/kernel.cpp')

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index ae3d30e81d..0b7198d1bc 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -628,7 +628,7 @@ int Kernel::findRegType(reg_t reg) {
 
 	switch (mobj->getType()) {
 	case SEG_TYPE_SCRIPT:
-		if (reg.offset <= (*(Script *)mobj)._bufSize &&
+		if (reg.offset <= (*(Script *)mobj).getBufSize() &&
 			reg.offset >= -SCRIPT_OBJECT_MAGIC_OFFSET &&
 		    RAW_IS_OBJECT((*(Script *)mobj)._buf + reg.offset)) {
 			return ((Script *)mobj)->getObject(reg.offset) ? KSIG_OBJECT : KSIG_REF;
-- 
cgit v1.2.3


From d30d57b923ddad194071d3fc07d79385c1ce4a37 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Mon, 7 Jun 2010 02:11:19 +0000
Subject: SCI: Relax signature of kCreateTextBitmap.

svn-id: r49470
---
 engines/sci/engine/kernel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/kernel.cpp')

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 0b7198d1bc..6ebee2dfbd 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -363,7 +363,7 @@ SciKernelFunction kfunct_mappers[] = {
 	DEFUN("ListIndexOf", kListIndexOf, "lZo"),
 	DEFUN("OnMe", kOnMe, "iio.*"),
 	DEFUN("InPolygon", kInPolygon, "iio"),
-	DEFUN("CreateTextBitmap", kCreateTextBitmap, "iiio"),
+	DEFUN("CreateTextBitmap", kCreateTextBitmap, "i.*"),
 
 	// SCI2.1 Kernel Functions
 	DEFUN("Save", kSave, ".*"),
-- 
cgit v1.2.3