From e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Tue, 5 Jun 2012 15:36:21 +0000 Subject: REdoing r71, without the mistakes --- nGenEx/D3DXImage.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'nGenEx/D3DXImage.cpp') diff --git a/nGenEx/D3DXImage.cpp b/nGenEx/D3DXImage.cpp index a10eac3..c83c2c4 100644 --- a/nGenEx/D3DXImage.cpp +++ b/nGenEx/D3DXImage.cpp @@ -12,8 +12,7 @@ D3DX image file loader */ -#include -#include "afxdlgs.h" + #include "MemDebug.h" #include "D3DXImage.h" #include "VideoDX9.h" @@ -54,14 +53,8 @@ bool D3DXImage::Load(char *filename) FILE* f; fopen_s(&f, filename,"rb"); - if (f == NULL) { - std::string errstring = "Magic was unable to locate the following texture: "; - errstring += filename; - errstring += "\nPlease locate the texture, and copy it to the same directory the Magic executable is in."; - - MessageBox(NULL, errstring.c_str(), "Help!", MB_ICONWARNING | MB_OK); - return success; - } + if (f == NULL) + return success; int len = 0; BYTE* buf = 0; -- cgit v1.1