From f0aea07261a4c781aadd8010866e40dfb58470d8 Mon Sep 17 00:00:00 2001
From: gerstrong <gerstrong@4df4b0f3-56ce-47cb-b001-ed939b7d65a6>
Date: Mon, 27 Jul 2009 17:54:06 +0000
Subject: [PATCH] * fixed some crashes which happened, when there were to many
 enemies on screen. * imporoved tile reading for some mods

git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@188 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
---
 future.txt                 | 1 -
 src/fileio/CTileLoader.cpp | 9 +++++++++
 src/game.cpp               | 7 +++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/future.txt b/future.txt
index 041f0d830..73c6af41c 100644
--- a/future.txt
+++ b/future.txt
@@ -6,7 +6,6 @@ until 0.4:
 - Update the Dialog Class. It should support more controls, and be easier to manage
 - New Games Menu. Should run without the need of an episode!
 - Improve the logic of Keen.exe reading for a better mod compatibility
-- Implement the patch reading of pat files.
 - Implement a better Audio Control. Volume, mute, etc.
 - improve the physics using floats
 - Ubuntu debs
diff --git a/src/fileio/CTileLoader.cpp b/src/fileio/CTileLoader.cpp
index 771ad39d8..ed05016a3 100644
--- a/src/fileio/CTileLoader.cpp
+++ b/src/fileio/CTileLoader.cpp
@@ -179,6 +179,15 @@ void CTileLoader::assignChangeTileAttribute(stTile *tile)
 	{
 		case 1:
 		{
+			for(int i=502 ; i<=506 ; i++) // Workaround in Level 12 of Episode 2, where the tiles are solid after a taken item.
+			{
+				if( (TileProperty[i][BEHAVIOR] >= 6 &&
+					 TileProperty[i][BEHAVIOR] <= 21 &&
+				     TileProperty[i][BEHAVIOR] != 17) ||
+				     TileProperty[i][BEHAVIOR] == 27 ||
+				     TileProperty[i][BEHAVIOR] == 28 )
+				tile[i].chgtile = 439;
+			}
 			break;
 		}
 		case 2:
diff --git a/src/game.cpp b/src/game.cpp
index 5b87452db..1150efdff 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -21,6 +21,7 @@
 #include "vorticon/CPlayer.h"
 #include "vorticon/CHighScores.h"
 #include "hqp/CHQBitmap.h"
+#include "CLogFile.h"
 char otherplayer;
 
 // TODO: seperate status boxes for the different players
@@ -655,10 +656,8 @@ int i;
    }
  }
  // object could not be created
- crashflag = 1;
- crashflag2 = otype;
- crashflag3 = 0;
- why_term_ptr = "Object could not be created.";
+
+ g_pLogFile->textOut(PURPLE, "Warning : Object could not be created.");
  return 0;
 }