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

[sev-]

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:
afdbfe4d2f AGI: Reset all timers on startup
9fd172cba6 CRUISE: Plug memory leak
6b62f91437 FULLPIPE: Fix statics initialization
f86daf67e3 SCUMM HE: Added debug output


Commit: afdbfe4d2f962910a7304394f450fefda2fb1960
    https://github.com/scummvm/scummvm/commit/afdbfe4d2f962910a7304394f450fefda2fb1960
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-07T10:25:09+02:00

Commit Message:
AGI: Reset all timers on startup

Changed paths:
    engines/agi/agi.cpp



diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index e566ad1..60c8d1f 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -403,6 +403,11 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
 
 	_lastSaveTime = 0;
 
+	_playTimeInSecondsAdjust = 0;
+	_lastUsedPlayTimeInCycles = 0;
+	_lastUsedPlayTimeInSeconds = 0;
+	_passedPlayTimeCycles = 0;
+
 	memset(_keyQueue, 0, sizeof(_keyQueue));
 
 	_console = nullptr;
@@ -418,6 +423,9 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
 	_inventory = nullptr;
 
 	_keyHoldMode = false;
+
+	_artificialDelayCurrentRoom = 0;
+	_artificialDelayCurrentPicture = 0;
 }
 
 void AgiEngine::initialize() {


Commit: 9fd172cba6de27ce8d6b148b5a45e4c663e2d518
    https://github.com/scummvm/scummvm/commit/9fd172cba6de27ce8d6b148b5a45e4c663e2d518
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-07T10:29:49+02:00

Commit Message:
CRUISE: Plug memory leak

Changed paths:
    engines/cruise/dataLoader.cpp



diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 7a1258d..7d00d08 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -249,9 +249,13 @@ int loadFile(const char* name, int idx, int destIdx) {
 		int numMaxEntriesInSet = getNumMaxEntiresInSet(ptr);
 
 		if (destIdx > numMaxEntriesInSet) {
+			MemFree(ptr);
 			return 0;	// exit if limit is reached
 		}
-		return loadSetEntry(name, ptr, destIdx, idx);
+		int res = loadSetEntry(name, ptr, destIdx, idx);
+		MemFree(ptr);
+
+		return res;
 	}
 	case type_FNT: {
 		return loadFNTSub(ptr, idx);


Commit: 6b62f91437309c5fc725ce8bfb62210d102c3492
    https://github.com/scummvm/scummvm/commit/6b62f91437309c5fc725ce8bfb62210d102c3492
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-07T11:05:48+02:00

Commit Message:
FULLPIPE: Fix statics initialization

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 8ee3b14..36fbb73 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1576,6 +1576,9 @@ Movement::Movement(Movement *src, int *oldIdxs, int newSize, StaticANIObject *an
 	_m2x = 0;
 	_m2y = 0;
 
+	_counter = 0;
+	_counterMax = 0;
+
 	_field_78 = 0;
 	_framePosOffsets = 0;
 	_field_84 = 0;


Commit: f86daf67e38d4d33181899bac97ac01f7461c338
    https://github.com/scummvm/scummvm/commit/f86daf67e38d4d33181899bac97ac01f7461c338
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-07T11:16:20+02:00

Commit Message:
SCUMM HE: Added debug output

Changed paths:
    engines/scumm/he/script_v100he.cpp



diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index e69308c..7d561382 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -1997,6 +1997,7 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
 				_sprite->setSpriteFlagRemapPalette(spriteId, args[0]);
 				break;
 			default:
+				warning("Unknown sprite property %d for sprite %d", args[0], spriteId);
 				break;
 			}
 		break;