From 2e87c6c32af2fedbc101148e2004d0869d1e5c65 Mon Sep 17 00:00:00 2001 From: albertzeyer Date: Wed, 22 Jul 2009 18:46:57 +0000 Subject: [PATCH] small additional check git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@101 4df4b0f3-56ce-47cb-b001-ed939b7d65a6 --- data/controls.dat | Bin 448 -> 448 bytes src/CGame.cpp | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/data/controls.dat b/data/controls.dat index f0d4b46a3257fe3f6ece9636819814190743b2d9..fb65e0e8144e39e9f73cebf9d04531febd6c4fe0 100644 GIT binary patch delta 12 TcmX@We1Lg^0;9=B#rcc?8<+#$ delta 13 UcmX@We1Lg^!X!q4jRq4K0U;;^OaK4? diff --git a/src/CGame.cpp b/src/CGame.cpp index c622d5963..64a6f74fc 100644 --- a/src/CGame.cpp +++ b/src/CGame.cpp @@ -248,6 +248,12 @@ int CGame::loadResources(unsigned short Episode, char *DataDirectory) // Load tile attributes. if(TileLoader) delete TileLoader; + + if(ExeFile->getData() == NULL) { + g_pLogFile->textOut(RED, "CGame::loadResources: Could not load data out of EXE
"); + return 1; + } + TileLoader = new CTileLoader(Episode, ExeFile->getEXEVersion(), ExeFile->getData()); if(!TileLoader->load()) return 1;