From 0d54aff6324b1f6c739df89ab072328cc5402873 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 14 Aug 2011 18:29:45 +0200
Subject: KYRA: (EOB) - add EOB 1 intro

(also add and fix several other things, like cone of cold vortex, drawShape issues, etc.)
---
 engines/kyra/scene_eob.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/kyra/scene_eob.cpp')

diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 4c1bb1636f..aef131f6cb 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1139,10 +1139,10 @@ void EobCoreEngine::drawDecorations(int index) {
 int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) {
 	uint16 b = calcNewBlockPosition(curBlock, direction);
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
-	
 	int f = _wllWallFlags[w];
+
 	if (!f)
-		assert (w < (_flags.gameID == GI_EOB1 ? 70 : 80));
+		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
 	if (w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
-- 
cgit v1.2.3