From c8dd272de836436011cb2b27b86dce1e8abc3807 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 25 Oct 2019 01:38:46 +0200
Subject: GRIFFON: Fix to for loop in drawNPCs

---
 engines/griffon/draw.cpp    | 4 ++--
 engines/griffon/griffon.cpp | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/griffon/draw.cpp b/engines/griffon/draw.cpp
index 4810667a83..d224c9f8bc 100644
--- a/engines/griffon/draw.cpp
+++ b/engines/griffon/draw.cpp
@@ -507,7 +507,7 @@ void GriffonEngine::drawNPCs(int mode) {
 
 				// onewing
 				if (_npcinfo[i].spriteset == kMonsterOneWing) {
-					for (int f = 0; f <= 7; f++) {
+					for (int f = 0; f < 7; f++) {
 						int s = _npcinfo[i].bodysection[f].sprite;
 						rcSrc.left = _animset2[s].x;
 						rcSrc.top = _animset2[s].y;
@@ -524,7 +524,7 @@ void GriffonEngine::drawNPCs(int mode) {
 
 				// twowing
 				if (_npcinfo[i].spriteset == kMonsterTwoWing) {
-					for (int f = 0; f <= 7; f++) {
+					for (int f = 0; f < 7; f++) {
 						int yp = 0;
 
 						if (f == 0 && (_curmap == 53 || _curmap == 57 || _curmap == 61 || _curmap == 65 || _curmap == 56 || _curmap > 66) && _scriptflag[kScriptLever][0] > 0)
diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp
index d107f4fdfc..3fcd4e456a 100644
--- a/engines/griffon/griffon.cpp
+++ b/engines/griffon/griffon.cpp
@@ -53,6 +53,11 @@ GriffonEngine::GriffonEngine(OSystem *syst) : Engine(syst) {
 
 	clouddeg = 0.0f;
 
+	for (int i = 0; i < 33; ++i) {
+		for (int j = 0; j < 6; ++j)
+			_objectInfo[i][j] = 0;
+	}
+
 	// Synchronize the sound settings from ScummVM
 	syncSoundSettings();
 	config_load(&config);
-- 
cgit v1.2.3