[Scummvm-git-logs] scummvm master -> 3662e80c0fa9e738407f49794e0f5281ff02c675

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5f57440dee GLK: GLULXE: Readded Cragne Manor detection entry
3662e80c0f GLK: Create objrocks for saved game file sreams


Commit: 5f57440deec5f6d34f2738f0705204557d3e6ab3
    https://github.com/scummvm/scummvm/commit/5f57440deec5f6d34f2738f0705204557d3e6ab3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-05-04T10:47:09+10:00

Commit Message:
GLK: GLULXE: Readded Cragne Manor detection entry

Changed paths:
    engines/glk/glulxe/detection_tables.h


diff --git a/engines/glk/glulxe/detection_tables.h b/engines/glk/glulxe/detection_tables.h
index 5eabc71..de8f5a7 100644
--- a/engines/glk/glulxe/detection_tables.h
+++ b/engines/glk/glulxe/detection_tables.h
@@ -377,6 +377,7 @@ const GlulxeGameDescription GLULXE_GAMES[] = {
 	ENTRY1("countingcrabs", "090728", "ffc19674d99b4d6f530bb00287c83c7e", 1508676),
 	ENTRY1("crackcoldone", "170706", "c2d5bf64a0aadaead7640b5750826d55", 627136),
 	ENTRY1("crackcoldone", "170711", "d64bd51d8fe05dc190ac3589e11b6ea6", 627136),
+	ENTRY1("cragne", "181208", "082f518c0120d2323ce340bef8a2d5a9", 8869096),
 	ENTRY1("damesdeadites", "150116", "c34b65232be2c25e558c31349e62b716", 812810),
 	ENTRY0("dansenocturne", "9a60eadb746e34c7364cbe423b712e0c", 810990),
 	ENTRY1("darkcarnival", "130924", "e5102c61fcb3b192c6455f214f6ca01d", 1733174),


Commit: 3662e80c0fa9e738407f49794e0f5281ff02c675
    https://github.com/scummvm/scummvm/commit/3662e80c0fa9e738407f49794e0f5281ff02c675
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-05-04T11:03:50+10:00

Commit Message:
GLK: Create objrocks for saved game file sreams

Changed paths:
    engines/glk/glulxe/glkop.cpp
    engines/glk/streams.cpp
    engines/glk/streams.h


diff --git a/engines/glk/glulxe/glkop.cpp b/engines/glk/glulxe/glkop.cpp
index 635d90b..70fb44b 100644
--- a/engines/glk/glulxe/glkop.cpp
+++ b/engines/glk/glulxe/glkop.cpp
@@ -677,6 +677,7 @@ void Glulxe::unparse_glk_args(dispatch_splot_t *splot, const char **proto, int d
 						opref = garglist[gargnum]._opaqueref;
 						if (opref) {
 							gidispatch_rock_t objrock = gidispatch_get_objrock(opref, *cx - 'a');
+							assert(objrock.ptr);
 							thisval = ((classref_t *)objrock.ptr)->id;
 						} else {
 							thisval = 0;
diff --git a/engines/glk/streams.cpp b/engines/glk/streams.cpp
index 907cde4..e0271ba 100644
--- a/engines/glk/streams.cpp
+++ b/engines/glk/streams.cpp
@@ -1588,6 +1588,11 @@ frefid_t Streams::iterate(frefid_t fref, uint *rock) {
 
 /*--------------------------------------------------------------------------*/
 
+FileReference::FileReference() : _rock(0), _slotNumber(-1), _fileType(fileusage_Data), _textMode(false) {
+	if (g_vm->gli_register_obj)
+		_dispRock = (*g_vm->gli_register_obj)(this, gidisp_Class_Fileref);
+}
+
 FileReference::FileReference(int slot, const Common::String &desc, uint usage, uint rock) :
 		_rock(rock), _slotNumber(slot), _description(desc),
 		_fileType((FileUsage)(usage & fileusage_TypeMask)), _textMode(usage & fileusage_TextMode) {
diff --git a/engines/glk/streams.h b/engines/glk/streams.h
index f899936..14ca91d 100644
--- a/engines/glk/streams.h
+++ b/engines/glk/streams.h
@@ -98,7 +98,7 @@ struct FileReference {
 	/**
 	 * Constructor
 	 */
-	FileReference() : _rock(0), _slotNumber(-1), _fileType(fileusage_Data), _textMode(false) {}
+	FileReference();
 
 	/**
 	 * Constructor