diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-05 15:36:21 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-05 15:36:21 +0000 |
| commit | e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc (patch) | |
| tree | e8f3e6f1bbbbdabe43c09ba55bca2e6098daef4d /nGenEx/D3DXImage.cpp | |
| parent | ad61263fe195a5975f986a7f23d767ef777ca22d (diff) | |
| download | starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.zip starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.gz starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.bz2 | |
REdoing r71, without the mistakes
Diffstat (limited to 'nGenEx/D3DXImage.cpp')
| -rw-r--r-- | nGenEx/D3DXImage.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
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 <string>
-#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;
|