[Scummvm-git-logs] scummvm master -> 22e949035b16508de48576e6484592defb0999c1

[sev-]

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

Summary:
22e949035b ASYLUM: Comment out unused variables


Commit: 22e949035b16508de48576e6484592defb0999c1
    https://github.com/scummvm/scummvm/commit/22e949035b16508de48576e6484592defb0999c1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-17T16:19:35+02:00

Commit Message:
ASYLUM: Comment out unused variables

Changed paths:
    engines/asylum/puzzles/timemachine.h
    engines/asylum/resources/data.cpp
    engines/asylum/resources/data.h
    engines/asylum/resources/object.cpp
    engines/asylum/resources/object.h


diff --git a/engines/asylum/puzzles/timemachine.h b/engines/asylum/puzzles/timemachine.h
index 4950210035..3472af890a 100644
--- a/engines/asylum/puzzles/timemachine.h
+++ b/engines/asylum/puzzles/timemachine.h
@@ -50,8 +50,8 @@ private:
 
 	// Unused puzzle variables
 	int8   _state[5];
-	bool   _data_4572BC;
-	bool   _data_4572CC;
+	//bool   _data_4572BC;
+	//bool   _data_4572CC;
 	uint32 _data_45AAA8;
 	uint32 _data_45AAAC;
 	uint32 _currentFrameIndex;
diff --git a/engines/asylum/resources/data.cpp b/engines/asylum/resources/data.cpp
index 2793e407db..494c8782dd 100644
--- a/engines/asylum/resources/data.cpp
+++ b/engines/asylum/resources/data.cpp
@@ -131,7 +131,7 @@ void SharedData::reset() {
 	_chapter2FrameIndexOffset = 1;
 }
 
-static const uint32 chapter2DataSizes[5] = {5, 9, 23, 18, 9};
+//static const uint32 chapter2DataSizes[5] = {5, 9, 23, 18, 9};
 int32 &CrowsData::operator[](uint32 index) {
 	if (index >= ARRAYSIZE(_data))
 		error("[CrowsData::operator[]] Invalid index (was: %d, valid: [0;%d])", index, ARRAYSIZE(_data) - 1);
diff --git a/engines/asylum/resources/data.h b/engines/asylum/resources/data.h
index d9747c05f8..1fa7a95a50 100644
--- a/engines/asylum/resources/data.h
+++ b/engines/asylum/resources/data.h
@@ -51,11 +51,11 @@ class SharedData;
 
 class CrowsData {
 public:
-	CrowsData(SharedData *sharedData) : _sharedData(sharedData), _data() {}
+	CrowsData(SharedData *sharedData) : /* _sharedData(sharedData), */_data() { memset(_data, 0, sizeof(_data)); }
 	int32 &operator [](uint32 index);
 private:
 	int32 _data[84];
-	SharedData *_sharedData;
+	//SharedData *_sharedData;
 };
 
 /**
diff --git a/engines/asylum/resources/object.cpp b/engines/asylum/resources/object.cpp
index 00d946622b..1f53be9155 100644
--- a/engines/asylum/resources/object.cpp
+++ b/engines/asylum/resources/object.cpp
@@ -37,7 +37,7 @@
 namespace Asylum {
 
 Object::Object(AsylumEngine *engine) : x(0), y(0), flags(0), actionType(0),
-	_vm(engine), _index(0),
+	_vm(engine), /* _index(0), */
 	_id(kObjectNone), _resourceId(kResourceNone), _field_20(0), _frameIndex(0), _frameCount(0),
 	_field_2C(0), _field_30(0), _field_34(0), _field_3C(0), _polygonIndex(0), _field_B4(0),
 	_tickCount(0), _tickCount2(0), _field_C0(0), _priority(0), _scriptIndex(0), _transparency(0),
diff --git a/engines/asylum/resources/object.h b/engines/asylum/resources/object.h
index d57e199aff..5d7ee86e8a 100644
--- a/engines/asylum/resources/object.h
+++ b/engines/asylum/resources/object.h
@@ -170,7 +170,7 @@ public:
 private:
 	AsylumEngine *_vm;
 
-	int32 _index;   ///< our index
+	//int32 _index;   ///< our index
 
 	//////////////////////////////////////////////////////////////////////////
 	// Data