[Scummvm-git-logs] scummvm master -> 8142f3d862368bb678529542d8149cd319e05ceb

[dreammaster]

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

Summary:
54c51805a8 GLK: COMPREHEND: Slightly decrease werewolf appearance
e968975959 GLK: Properly initialize bool window fields with false
11bc7b4414 GLK: COMPREHEND: Fix corrupted string
8142f3d862 GLK: COMPREHEND: Remove deprecated code


Commit: 54c51805a8cc912731730665cbba5d138323e705
    https://github.com/scummvm/scummvm/commit/54c51805a8cc912731730665cbba5d138323e705
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-14T09:56:00-07:00

Commit Message:
GLK: COMPREHEND: Slightly decrease werewolf appearance

I just it's appearing a bit too frequently in ScummVM.
It may actually be accurate to the original; hard to
say for sure, since I haven't fully reviewed it's
random number generation. But what the heck

Changed paths:
    engines/glk/comprehend/game_tr.cpp


diff --git a/engines/glk/comprehend/game_tr.cpp b/engines/glk/comprehend/game_tr.cpp
index 69859f3dc6..0a720705e5 100644
--- a/engines/glk/comprehend/game_tr.cpp
+++ b/engines/glk/comprehend/game_tr.cpp
@@ -57,7 +57,7 @@ struct TransylvaniaMonster {
 
 
 const TransylvaniaMonster TransylvaniaGame::WEREWOLF = {
-	ITEM_WEREWOLF, 7, ROOMFLAG_WEREWOLF, 10, 172
+	ITEM_WEREWOLF, 7, ROOMFLAG_WEREWOLF, 10, 190
 };
 
 const TransylvaniaMonster TransylvaniaGame::VAMPIRE = {


Commit: e96897595934d516a61836bb02295a90afa7aeaa
    https://github.com/scummvm/scummvm/commit/e96897595934d516a61836bb02295a90afa7aeaa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-14T09:56:00-07:00

Commit Message:
GLK: Properly initialize bool window fields with false

Changed paths:
    engines/glk/windows.cpp


diff --git a/engines/glk/windows.cpp b/engines/glk/windows.cpp
index bea4f5934a..e405271b80 100644
--- a/engines/glk/windows.cpp
+++ b/engines/glk/windows.cpp
@@ -520,8 +520,9 @@ Window *Windows::iterateTreeOrder(Window *win) {
 
 Window::Window(Windows *windows, uint rock) : _windows(windows), _rock(rock),
 	_type(0), _parent(nullptr), _next(nullptr), _prev(nullptr), _yAdj(0),
-	_lineRequest(0), _lineRequestUni(0), _charRequest(0), _charRequestUni(0),
-	_mouseRequest(0), _hyperRequest(0), _moreRequest(0), _scrollRequest(0), _imageLoaded(0),
+	_lineRequest(false), _lineRequestUni(false), _charRequest(false),
+	_charRequestUni(false), _mouseRequest(false), _hyperRequest(false),
+	_moreRequest(false), _scrollRequest(false), _imageLoaded(false),
 	_echoLineInputBase(true), _lineTerminatorsBase(nullptr), _termCt(0), _echoStream(nullptr) {
 	_attr.fgset = false;
 	_attr.bgset = false;


Commit: 11bc7b4414682e9f9f2016b70deb4f9cba1679cf
    https://github.com/scummvm/scummvm/commit/11bc7b4414682e9f9f2016b70deb4f9cba1679cf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-14T09:56:00-07:00

Commit Message:
GLK: COMPREHEND: Fix corrupted string

Changed paths:
    engines/glk/comprehend/game_data.h
    engines/glk/comprehend/game_tr.cpp
    engines/glk/comprehend/game_tr.h


diff --git a/engines/glk/comprehend/game_data.h b/engines/glk/comprehend/game_data.h
index 593c577319..542c964ea1 100644
--- a/engines/glk/comprehend/game_data.h
+++ b/engines/glk/comprehend/game_data.h
@@ -451,9 +451,7 @@ public:
 	}
 
 	void clearGame();
-	void loadGame();
-	//void restoreGame(ComprehendGame *game, const char *filename);
-	//void saveGame(const char *filename);
+	virtual void loadGame();
 };
 
 } // namespace Comprehend
diff --git a/engines/glk/comprehend/game_tr.cpp b/engines/glk/comprehend/game_tr.cpp
index 0a720705e5..a7eecc4549 100644
--- a/engines/glk/comprehend/game_tr.cpp
+++ b/engines/glk/comprehend/game_tr.cpp
@@ -273,5 +273,14 @@ void TransylvaniaGame::beforeGame() {
 	g_comprehend->setDisableSaves(false);
 }
 
+void TransylvaniaGame::loadGame() {
+	ComprehendGame::loadGame();
+
+	// TODO: Figure out why the corrupt string happened, since it could
+	// affect other strings
+	_strings2[192] = "envelopes the sarcophagus. In a violent blast, the lid flies off "
+		"and explodes in a cascade of glowing dust!";
+}
+
 } // namespace Comprehend
 } // namespace Glk
diff --git a/engines/glk/comprehend/game_tr.h b/engines/glk/comprehend/game_tr.h
index 70e4a059e5..a91a23f592 100644
--- a/engines/glk/comprehend/game_tr.h
+++ b/engines/glk/comprehend/game_tr.h
@@ -47,6 +47,7 @@ public:
 	void synchronizeSave(Common::Serializer &s) override;
 	int roomIsSpecial(unsigned room_index, unsigned *roomDescString) override;
 	void handleSpecialOpcode(uint8 operand) override;
+	void loadGame() override;
 };
 
 } // namespace Comprehend


Commit: 8142f3d862368bb678529542d8149cd319e05ceb
    https://github.com/scummvm/scummvm/commit/8142f3d862368bb678529542d8149cd319e05ceb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-14T09:56:00-07:00

Commit Message:
GLK: COMPREHEND: Remove deprecated code

Changed paths:
    engines/glk/comprehend/game.cpp


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index b39751dc66..bd07a88349 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -198,14 +198,7 @@ void ComprehendGame::console_println(const char *text) {
 
 		if (!word || !word_len)
 			continue;
-#ifdef DEPRECATED
-		/* Print this word */
-		if (line_length + word_len > console_winsize.ws_col) {
-			/* Too long - insert a line break */
-			g_comprehend->print("\n");
-			line_length = 0;
-		}
-#endif
+
 		Common::String wordStr(word, word_len);
 		g_comprehend->print("%s", wordStr.c_str());