[Scummvm-cvs-logs] scummvm master -> f25c8482384d6fc5c7058d47ea9d78492fd3c323

sev- sev at scummvm.org
Mon Jun 13 22:00:46 CEST 2016


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:
f25c848238 MOHAWK: Engine classes initializations


Commit: f25c8482384d6fc5c7058d47ea9d78492fd3c323
    https://github.com/scummvm/scummvm/commit/f25c8482384d6fc5c7058d47ea9d78492fd3c323
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-13T22:00:38+02:00

Commit Message:
MOHAWK: Engine classes initializations

Changed paths:
    engines/mohawk/cstime.h
    engines/mohawk/cstime_game.cpp
    engines/mohawk/cstime_ui.cpp



diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h
index f95222d..bfb7daf 100644
--- a/engines/mohawk/cstime.h
+++ b/engines/mohawk/cstime.h
@@ -111,7 +111,7 @@ enum {
 };
 
 struct CSTimeEvent {
-	CSTimeEvent() { }
+	CSTimeEvent() : type(0), param1(0), param2(0) { }
 	CSTimeEvent(uint16 t, uint16 p1, uint16 p2) : type(t), param1(p1), param2(p2) { }
 
 	uint16 type;
diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index 8eced70..c939d8b 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -94,6 +94,11 @@ CSTimeChar::CSTimeChar(MohawkEngine_CSTime *vm, CSTimeScene *scene, uint id) : _
 	_lastTime2 = 0;
 	_lastTime3 = 0;
 
+	_unknown1 = _unknown2 = _unknown3 = 0;
+	_enabled = false;
+	_nextCue = 0;
+	_waveStatus = 0;
+
 	_playingWaveId = 0;
 }
 
diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp
index f3fe27a..59be95a 100644
--- a/engines/mohawk/cstime_ui.cpp
+++ b/engines/mohawk/cstime_ui.cpp
@@ -79,6 +79,8 @@ CSTimeInterface::CSTimeInterface(MohawkEngine_CSTime *vm) : _vm(vm) {
 	_rolloverTextFeature = NULL;
 	_bubbleTextFeature = NULL;
 
+	_draggedItem = 0;
+
 	_mouseWasInScene = false;
 	_state = kCSTimeInterfaceStateNormal;
 
@@ -1034,6 +1036,8 @@ CSTimeInventoryDisplay::CSTimeInventoryDisplay(MohawkEngine_CSTime *vm, Common::
 	_cuffsState = false;
 	_cuffsShape = 10;
 
+	_draggedItem = 0;
+
 	_invRect = baseRect;
 
 	for (uint i = 0; i < MAX_DISPLAYED_ITEMS; i++) {






More information about the Scummvm-git-logs mailing list