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

[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:
9acf733d81 SAGA: Safer string copying
d576abb3a2 SAGA: Init puzzle properly
0f6d2b86de SAGA: Initialization for IsoMap
f76f84a23b SCUMM HE: More debug output


Commit: 9acf733d81045a25f2710d63723ed7c351b21f7b
    https://github.com/scummvm/scummvm/commit/9acf733d81045a25f2710d63723ed7c351b21f7b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-05T09:23:09+02:00

Commit Message:
SAGA: Safer string copying

Changed paths:
    engines/saga/saveload.cpp



diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index e659e09..2d798bb 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -56,7 +56,7 @@ SaveFileData *SagaEngine::getSaveFile(uint idx) {
 		return &_saveFiles[_saveFilesCount - idx - 1];
 	} else {
 		if (!emptySlot.name[0])
-			strcpy(emptySlot.name, getTextString(kTextNewSave));
+			Common::strlcpy(emptySlot.name, getTextString(kTextNewSave), SAVE_TITLE_SIZE);
 
 		return (idx == 0) ? &emptySlot : &_saveFiles[_saveFilesCount - idx];
 	}


Commit: d576abb3a27c41546ad9d44f90e6d6c8c80e8a34
    https://github.com/scummvm/scummvm/commit/d576abb3a27c41546ad9d44f90e6d6c8c80e8a34
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-05T09:26:08+02:00

Commit Message:
SAGA: Init puzzle properly

Changed paths:
    engines/saga/puzzle.cpp



diff --git a/engines/saga/puzzle.cpp b/engines/saga/puzzle.cpp
index 099bf79..2c9a02b 100644
--- a/engines/saga/puzzle.cpp
+++ b/engines/saga/puzzle.cpp
@@ -86,6 +86,11 @@ Puzzle::Puzzle(SagaEngine *vm) : _vm(vm), _solved(false), _active(false) {
 	_hintBox.setWidth(240);
 	_hintBox.setHeight(30);
 
+	_hintNextRqState = kRQNoHint;
+	_hintGiver = 0;
+	_hintSpeaker = 0;
+	_slidePointX = _slidePointY = 0;
+
 	initPieceInfo( 0, 268,  18,  0, 0,  0 + PUZZLE_X_OFFSET,   0 + PUZZLE_Y_OFFSET, 0, 3,
 		  Point(0, 1),  Point(0, 62), Point(15, 31), Point(0, 0), Point(0, 0), Point(0,0));
 	initPieceInfo( 1, 270,  52,  0, 0,  0 + PUZZLE_X_OFFSET,  32 + PUZZLE_Y_OFFSET, 0, 4,


Commit: 0f6d2b86de910963ffc2ad3aa416b96db6878bae
    https://github.com/scummvm/scummvm/commit/0f6d2b86de910963ffc2ad3aa416b96db6878bae
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-05T09:39:20+02:00

Commit Message:
SAGA: Initialization for IsoMap

Changed paths:
    engines/saga/isomap.cpp



diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp
index 7768017..e50378b 100644
--- a/engines/saga/isomap.cpp
+++ b/engines/saga/isomap.cpp
@@ -97,6 +97,23 @@ IsoMap::IsoMap(SagaEngine *vm) : _vm(vm) {
 	_viewScroll.x = (128 - 8) * 16;
 	_viewScroll.y = (128 - 8) * 16 - 64;
 	_viewDiff = 1;
+	_platformHeight = 0;
+	_queueCount = _readCount = 0;
+
+	for (int i = 0; i < SAGA_DRAGON_SEARCH_DIAMETER; i++)
+		for (int j = 0; j < SAGA_DRAGON_SEARCH_DIAMETER; j++)
+			_dragonSearchArray.cell[i][j].visited = _dragonSearchArray.cell[i][j].direction = 0;
+
+	for (int i = 0; i < SAGA_SEARCH_DIAMETER; i++)
+		for (int j = 0; j < SAGA_SEARCH_DIAMETER; j++)
+			_searchArray.cell[i][j].visited = _searchArray.cell[i][j].direction = 0;
+
+	for (int i = 0; i < SAGA_SEARCH_QUEUE_SIZE; i++) {
+		memset(&_dragonSearchArray.queue[i], 0, sizeof(DragonTilePoint));
+		memset(&_searchArray.queue[i], 0, sizeof(TilePoint));
+	}
+
+	memset(&_tileMap, 0, sizeof(TileMapData));
 }
 
 void IsoMap::loadImages(const ByteArray &resourceData) {


Commit: f76f84a23b54ad6224deee8c8200ca094720dfd1
    https://github.com/scummvm/scummvm/commit/f76f84a23b54ad6224deee8c8200ca094720dfd1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-05T23:25:33+02:00

Commit Message:
SCUMM HE: More debug output

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



diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 4ca034f..b192fab 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -746,7 +746,7 @@ void Sprite::setSpriteField84(int spriteId, int value) {
 }
 
 void Sprite::setSpriteGeneralProperty(int spriteId, int type, int value) {
-	debug(4, "setSpriteGeneralProperty: spriteId %d type 0x%x", spriteId, type);
+	debug(0, "setSpriteGeneralProperty: spriteId %d type 0x%x value 0x%x", spriteId, type, value);
 	assertRange(1, spriteId, _varNumSprites, "sprite");
 	int32 delay;