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 | |
| parent | ad61263fe195a5975f986a7f23d767ef777ca22d (diff) | |
| download | starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.zip starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.gz starshatter-e3aeb5281ab3de5d1ac0fcacab825ce7a89f8afc.tar.bz2 | |
REdoing r71, without the mistakes
Diffstat (limited to 'nGenEx')
| -rw-r--r-- | nGenEx/ActiveWindow.h | 4 | ||||
| -rw-r--r-- | nGenEx/D3DXImage.cpp | 13 | ||||
| -rw-r--r-- | nGenEx/nGenEx.vcxproj | 16 |
3 files changed, 8 insertions, 25 deletions
diff --git a/nGenEx/ActiveWindow.h b/nGenEx/ActiveWindow.h index c95fb6a..cd7780b 100644 --- a/nGenEx/ActiveWindow.h +++ b/nGenEx/ActiveWindow.h @@ -315,10 +315,10 @@ protected: void Map##cname##fname(ActiveWindow* client, AWEvent* event) \
{ cname* c = (cname*) client; c->fname(event); }
-#define REGISTER_CLIENT(eid, ctrl, cname, fname)\ //-V571
+#define REGISTER_CLIENT(eid, ctrl, cname, fname)\
if (ctrl) ctrl->RegisterClient(eid, this, Map##cname##fname);
-#define UNREGISTER_CLIENT(eid, ctrl, cname)\ //-V571
+#define UNREGISTER_CLIENT(eid, ctrl, cname)\
if (ctrl) ctrl->UnregisterClient(eid, this);
#endif ActiveWindow_h
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;
diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj index 6aa59cb..81907cd 100644 --- a/nGenEx/nGenEx.vcxproj +++ b/nGenEx/nGenEx.vcxproj @@ -67,11 +67,9 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -83,31 +81,28 @@ <ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -125,19 +120,14 @@ <ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug x64|Win32'">
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'">
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
|