[Scummvm-git-logs] scummvm master -> cbb0d9ca95a9859db4e3269b012fb8a913b8a373

[alxpnv]

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

Summary:
a4af39dcf9 ASYLUM: convert some warning() calls to debugC()
4f7fbe66bc ASYLUM: fix cursor visibility
cbb0d9ca95 ASYLUM: (Lock puzzle) set the initial state to all '-'


Commit: a4af39dcf9f44ae6cc1ec80cc9266706f1a37ab2
    https://github.com/scummvm/scummvm/commit/a4af39dcf9f44ae6cc1ec80cc9266706f1a37ab2
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-06-16T15:41:14+03:00

Commit Message:
ASYLUM: convert some warning() calls to debugC()

Changed paths:
    engines/asylum/puzzles/hivecontrol.cpp
    engines/asylum/resources/data.cpp
    engines/asylum/resources/script.cpp


diff --git a/engines/asylum/puzzles/hivecontrol.cpp b/engines/asylum/puzzles/hivecontrol.cpp
index 6f4da22feb..cf666a3a5a 100644
--- a/engines/asylum/puzzles/hivecontrol.cpp
+++ b/engines/asylum/puzzles/hivecontrol.cpp
@@ -69,8 +69,9 @@ PuzzleHiveControl::~PuzzleHiveControl() {
 }
 
 void PuzzleHiveControl::saveLoadWithSerializer(Common::Serializer &s) {
+	// TODO
 	s.skip(6 * 4 * 2);
-	warning("[PuzzleHiveControl::saveLoadWithSerializer] Not implemented");
+	debugC(kDebugLevelSavegame, "[PuzzleHiveControl::saveLoadWithSerializer] Not implemented");
 
 	s.syncAsSint32LE(_soundVolume);
 }
diff --git a/engines/asylum/resources/data.cpp b/engines/asylum/resources/data.cpp
index 494c8782dd..749b73835a 100644
--- a/engines/asylum/resources/data.cpp
+++ b/engines/asylum/resources/data.cpp
@@ -22,6 +22,8 @@
 
 #include "common/textconsole.h"
 
+#include "engines/asylum/console.h"
+
 #include "engines/asylum/resources/data.h"
 
 namespace Asylum {
@@ -303,6 +305,8 @@ void SharedData::saveLoadAmbientSoundData(Common::Serializer &s) {
 }
 
 void SharedData::saveLoadWithSerializer(Common::Serializer &s) {
+	debugC(kDebugLevelSavegame, "[SharedData::saveLoadWithSerializer] Saving Chapter 2 actor data is not implemented");
+
 	// Global coordinates (original uses int32 for coordinates)
 	s.syncAsSint32LE(_globalPoint.x);
 	s.syncAsSint32LE(_globalPoint.y);
diff --git a/engines/asylum/resources/script.cpp b/engines/asylum/resources/script.cpp
index b679db29f4..bda990b321 100644
--- a/engines/asylum/resources/script.cpp
+++ b/engines/asylum/resources/script.cpp
@@ -1812,7 +1812,7 @@ IMPLEMENT_OPCODE(UpdateTransparency)
 		if (cmd->param1) {
 			Object *object = getWorld()->getObjectById((ObjectId)cmd->param1);
 			if (!object) {
-				warning("No object with id %d", cmd->param1);
+				debugC(kDebugLevelObjects, "Object with id %d doesn't exist", cmd->param1);
 				return;
 			}
 


Commit: 4f7fbe66bc91473f49ac91a3ab6ae048b567f06a
    https://github.com/scummvm/scummvm/commit/4f7fbe66bc91473f49ac91a3ab6ae048b567f06a
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-06-16T15:41:14+03:00

Commit Message:
ASYLUM: fix cursor visibility

This makes sure that the cursor is not shown on scene title screen
and when animation is playing

Changed paths:
    engines/asylum/system/cursor.cpp
    engines/asylum/views/scene.cpp


diff --git a/engines/asylum/system/cursor.cpp b/engines/asylum/system/cursor.cpp
index 9e5d13c278..683c64964d 100644
--- a/engines/asylum/system/cursor.cpp
+++ b/engines/asylum/system/cursor.cpp
@@ -52,6 +52,8 @@ void Cursor::show() const {
 }
 
 void Cursor::set(ResourceId resourceId, int32 cnt, CursorAnimation anim, int32 frames) {
+	bool wasHidden = isHidden();
+
 	hide();
 
 	delete _cursorRes;
@@ -83,7 +85,8 @@ void Cursor::set(ResourceId resourceId, int32 cnt, CursorAnimation anim, int32 f
 
 	update();
 
-	show();
+	if (!wasHidden)
+		show();
 }
 
 void Cursor::update() {
diff --git a/engines/asylum/views/scene.cpp b/engines/asylum/views/scene.cpp
index 2879537640..bca67659c2 100644
--- a/engines/asylum/views/scene.cpp
+++ b/engines/asylum/views/scene.cpp
@@ -2366,6 +2366,7 @@ void Scene::preload() {
 
 	SceneTitle *title = new SceneTitle(_vm);
 	title->load();
+	getCursor()->hide();
 
 	do {
 		title->update(_vm->getTick());
@@ -2392,6 +2393,8 @@ bool Scene::drawScene() {
 
 	if (getSharedData()->getFlag(kFlagSkipDrawScene)) {
 		_vm->screen()->fillRect(0, 0, 640, 480, 0);
+		getCursor()->hide();
+
 		return false;
 	}
 


Commit: cbb0d9ca95a9859db4e3269b012fb8a913b8a373
    https://github.com/scummvm/scummvm/commit/cbb0d9ca95a9859db4e3269b012fb8a913b8a373
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-06-16T15:41:14+03:00

Commit Message:
ASYLUM: (Lock puzzle) set the initial state to all '-'

Changed paths:
    engines/asylum/puzzles/lock.cpp


diff --git a/engines/asylum/puzzles/lock.cpp b/engines/asylum/puzzles/lock.cpp
index 8e7849fec8..cdaeb6aac1 100644
--- a/engines/asylum/puzzles/lock.cpp
+++ b/engines/asylum/puzzles/lock.cpp
@@ -43,6 +43,7 @@ const int16 puzzleLockPolygons[16][2] = {
 
 PuzzleLock::PuzzleLock(AsylumEngine *engine) : Puzzle(engine) {
 	memset(&_frameIndexes, 0, sizeof(_frameIndexes));
+	_frameIndexes[0] = _frameIndexes[1] = _frameIndexes[2] = 4;
 	_incrementLock = false;
 	_counter = 0;
 	memset(&_ticks, 0, sizeof(_ticks));