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

[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:
da5f8d0642 GRIFFON: Initialize more variables


Commit: da5f8d06422d7285c8e53aac8477806304b778c7
    https://github.com/scummvm/scummvm/commit/da5f8d06422d7285c8e53aac8477806304b778c7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-12T23:20:58+01:00

Commit Message:
GRIFFON: Initialize more variables

Changed paths:
    engines/griffon/draw.cpp
    engines/griffon/resources.cpp


diff --git a/engines/griffon/draw.cpp b/engines/griffon/draw.cpp
index fe28384..fe5354c 100644
--- a/engines/griffon/draw.cpp
+++ b/engines/griffon/draw.cpp
@@ -183,6 +183,8 @@ void GriffonEngine::drawHud() {
 	//sprintf(line, "_fps: %i, map: %i, exp: %i/%i", (int)_fps, _curmap, _player.exp, _player.nextlevel);
 	//drawString(_videobuffer, line, 0, 0, 0);
 
+	_itemyloc = 0;
+
 	game_fillrect(_videoBuffer2, 0, 0, 320, 240, 0);
 
 	for (int i = 0; i < kMaxFloat; i++) {
diff --git a/engines/griffon/resources.cpp b/engines/griffon/resources.cpp
index 4ce1c5d..c413e4b 100644
--- a/engines/griffon/resources.cpp
+++ b/engines/griffon/resources.cpp
@@ -491,6 +491,9 @@ void GriffonEngine::loadMap(int mapnum) {
 		INPUT("%i", &_npcInfo[i].item3);
 		INPUT("%i", &_npcInfo[i].script);
 
+		_npcInfo[i].frame2 = 0;
+		_npcInfo[i].attackattempt = 0;
+
 		// baby dragon
 		if (_npcInfo[i].spriteset == kMonsterBabyDragon) {
 			_npcInfo[i].hp = 12;